/[PAMELA software]/PamelaLevel2/src/PamLevel2.cpp
ViewVC logotype

Diff of /PamelaLevel2/src/PamLevel2.cpp

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.14 by pam-fi, Tue Jan 16 10:20:21 2007 UTC revision 1.15 by mocchiut, Tue Jan 16 13:00:26 2007 UTC
# Line 113  PamLevel2::PamLevel2(){ Line 113  PamLevel2::PamLevel2(){
113      orb_obj   = 0;      orb_obj   = 0;
114    
115      run_obj   = 0;//new GL_RUN();      run_obj   = 0;//new GL_RUN();
116        soft_obj   = 0;// Emiliano
117            
118    
119      for(Int_t i=0; i<8; i++ )tree_clone[i]=NULL;      for(Int_t i=0; i<8; i++ )tree_clone[i]=NULL;
# Line 143  PamLevel2::PamLevel2(){ Line 144  PamLevel2::PamLevel2(){
144  void PamLevel2::Delete(){  void PamLevel2::Delete(){
145                    
146      if(run_obj)delete run_obj;      if(run_obj)delete run_obj;
147        if(soft_obj)delete soft_obj; //Emiliano
148    
149  //    cout << "void PamLevel2::Clear()"<<endl;  //    cout << "void PamLevel2::Clear()"<<endl;
150      if(trk1_obj) delete trk1_obj;            if(trk1_obj) delete trk1_obj;      
# Line 173  void PamLevel2::Delete(){ Line 175  void PamLevel2::Delete(){
175  void PamLevel2::Clear(){  void PamLevel2::Clear(){
176                    
177  //    cout << "void PamLevel2::Clear()"<<endl;  //    cout << "void PamLevel2::Clear()"<<endl;
178      if(run_obj)delete run_obj;  
179    //
180    //    if(run_obj)delete run_obj;
181        if(run_obj) run_obj->Clear();  // Emiliano: Do not deallocate run_obj here, it will give segmentation fault! call clear instead
182        if(soft_obj) soft_obj->Clear();
183    
184      if(trk1_obj) trk1_obj->Clear();          if(trk1_obj) trk1_obj->Clear();    
185      if(trk2_obj) trk2_obj->Clear();      if(trk2_obj) trk2_obj->Clear();
# Line 266  void *PamLevel2::GetPointerTo(const char Line 272  void *PamLevel2::GetPointerTo(const char
272      };      };
273            
274      if(!objname.CompareTo("RunInfo"))return &run_obj;      if(!objname.CompareTo("RunInfo"))return &run_obj;
275    
276        if(!objname.CompareTo("SoftInfo"))return &soft_obj; // Emiliano
277    
278      return NULL;      return NULL;
279  };  };
280  //--------------------------------------  //--------------------------------------
# Line 1370  TChain *PamLevel2::GetRunTree(TList *fl) Line 1379  TChain *PamLevel2::GetRunTree(TList *fl)
1379            
1380      R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));      R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));
1381      cout << "Run         : set branch address RunInfo"<<endl;      cout << "Run         : set branch address RunInfo"<<endl;
1382        R->SetBranchAddress("SoftInfo", GetPointerTo("SoftInfo")); // Emiliano
1383        cout << "Software    : set branch address SoftInfo"<<endl; // Emiliano
1384            
1385      return R;      return R;
1386            
# Line 1390  TTree *PamLevel2::GetRunTree(TFile *f){ Line 1401  TTree *PamLevel2::GetRunTree(TFile *f){
1401            
1402      R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));      R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));
1403      cout << "Run         : set branch address RunInfo"<<endl;      cout << "Run         : set branch address RunInfo"<<endl;
1404        R->SetBranchAddress("SoftInfo", GetPointerTo("SoftInfo")); // Emiliano
1405        cout << "Software    : set branch address SoftInfo"<<endl; // Emiliano
1406            
1407      return R;      return R;
1408            
Legend:
Removed from v.1.14  
changed lines
  Added in v.1.15
  ViewVC Help
Powered by ViewVC 1.1.23