--- PamelaLevel2/src/PamLevel2.cpp	2007/03/08 13:46:34	1.22
+++ PamelaLevel2/src/PamLevel2.cpp	2007/03/22 10:12:35	1.36
@@ -85,9 +85,32 @@
 //
 //--------------------------------------
 /**
- * Constructor 
+ * Default Constructor 
  */
 PamLevel2::PamLevel2(){
+  Initialize();
+};
+
+/**
+ * Constructor with given dir, list and detectors
+ */
+PamLevel2::PamLevel2(TString ddir,TString list,TString detlist){
+  Initialize();
+  GetPamTree(GetListOfLevel2Files(ddir,list),detlist);
+  GetRunTree(GetListOfLevel2Files(ddir,list));
+};
+
+/**
+ * Constructor with given dir and list 
+ */
+PamLevel2::PamLevel2(TString ddir,TString list){
+  Initialize();
+  GetPamTree(GetListOfLevel2Files(ddir,list),"");
+  GetRunTree(GetListOfLevel2Files(ddir,list));
+};
+
+
+void PamLevel2::Initialize(){
 	
 //     trk2_obj  = TrkLevel2::GetTrkLevel2();
 //     trk1_obj  = TrkLevel1::GetTrkLevel1();
@@ -103,6 +126,7 @@
     
     h0_obj    = 0;
     trk0_obj  = 0;
+    calo0_obj  = 0;
 
     trk2_obj  = 0;
     trk1_obj  = 0;
@@ -118,22 +142,23 @@
 
     run_obj   = 0;//new GL_RUN();
     soft_obj   = 0;// Emiliano
-    irun = -1;
-    runfirstentry = 0ULL;
-    runlastentry = 0ULL;
+    irun = -1LL;
+    runfirstentry = 0LL;
+    runlastentry = 0LL;
 
     l0_file = NULL;
     l0_tree = NULL;
     iroot   = -1;
     dbc     = 0;
+
+    prevshift = 0;
     
-    irun = -1;
     run_tree = NULL;
     run_tree_clone = NULL;
     sel_tree = NULL;
     sel_tree_clone = NULL;
     
-    irunentry = -1;
+    irunentry = -1LL;
     pam_tree = NULL;
     for(Int_t i=0; i<NCLONES; i++ )pam_tree_clone[i]=NULL;
 
@@ -188,6 +213,7 @@
 //    cout << "void PamLevel2::Clear()"<<endl;
     if(h0_obj)   delete h0_obj;	
     if(trk0_obj) delete trk0_obj;	
+    if(calo0_obj) delete calo0_obj;	
     if(trk1_obj) delete trk1_obj;	
     if(trk2_obj) delete trk2_obj;
     if(trkh_obj) delete trkh_obj;
@@ -215,7 +241,39 @@
     }
     
     if(l0_file)l0_file->Close();
-    if(pam_tree)pam_tree->Delete();;
+    //    if(pam_tree)pam_tree->Delete();;
+
+  if ( pam_tree ){
+    //
+    // we have first to find which chains we have to delete, then delete the main chain and only after delete the friend chains. Any other order causes a segfault...
+    //
+    TList *temp = pam_tree->GetListOfFriends();
+    TList *contents  = new TList; // create chain friend list
+    contents->SetOwner();
+    TIter next(temp);
+    TChain *questo = 0;
+    while ( (questo = (TChain*) next()) ){
+      TString name =  questo->GetName();
+      contents->Add((TChain*)gROOT->FindObject(name.Data()));// add object to the list
+    };
+    //
+    // deleting the main chain
+    //
+    pam_tree->Delete();
+    //
+    // deleting the friends...
+    //
+    TIter next2(contents);
+    TChain *questa = 0;
+    while ( questa = (TChain*)next2() ){
+      TString name =  questa->GetName();
+      questa->Delete();      
+      questa=NULL;
+    };
+    //
+  };
+  pam_tree = NULL;
+
     if(run_tree)run_tree->Delete();;
     if(sel_tree)sel_tree->Delete();;
     for(Int_t i=0; i<NCLONES; i++ )if(pam_tree_clone[i])pam_tree_clone[i]->Delete();;
@@ -241,9 +299,10 @@
 //    if(soft_obj) soft_obj->Clear();
 
     if(h0_obj)   h0_obj->Clear();	
-    if(trk0_obj) trk0_obj->Clear();	
+//    if(trk0_obj) trk0_obj->Clear();	
+    if(calo0_obj) calo0_obj->Clear();	
     if(trk1_obj) trk1_obj->Clear();	
-    if(trk2_obj) trk2_obj->Clear();
+    if(trk2_obj) trk2_obj->Clear(); 
     if(trkh_obj) trkh_obj->Clear();
     if(calo1_obj)calo1_obj->Clear();
     if(calo2_obj)calo2_obj->Clear();
@@ -263,7 +322,81 @@
     if(timage){
 	timage->Delete();
     }
-    
+};
+
+void PamLevel2::Reset(){
+  //
+  // First of all clear everything
+  //
+  Clear();
+  //
+  // close and reset chains and pointers
+  //    
+  if ( pam_tree ){
+    //
+    // we have first to find which chains we have to delete, then delete the main chain and only after delete the friend chains. Any other order causes a segfault...
+    //
+    TList *temp = pam_tree->GetListOfFriends();
+    TList *contents  = new TList; // create chain friend list
+    contents->SetOwner();
+    TIter next(temp);
+    TChain *questo = 0;
+    while ( (questo = (TChain*) next()) ){
+      TString name =  questo->GetName();
+      contents->Add((TChain*)gROOT->FindObject(name.Data()));// add object to the list
+    };
+    //
+    // deleting the main chain
+    //
+    pam_tree->Delete();
+    //
+    // deleting the friends...
+    //
+    TIter next2(contents);
+    TChain *questa = 0;
+    while ( questa = (TChain*)next2() ){
+      TString name =  questa->GetName();
+      questa->Delete();      
+      questa=NULL;
+    };
+    //
+  };
+  pam_tree = NULL;
+  //
+  if(run_tree)run_tree->Delete();;
+  run_tree = NULL;
+  if(sel_tree)sel_tree->Delete();;
+  sel_tree = NULL;
+  //
+  // Close file
+  //
+  if(l0_file)l0_file->Close("R");
+  l0_file = NULL;
+  //
+  h0_obj    = 0;
+  trk0_obj  = 0;
+  calo0_obj  = 0;
+  //
+  trk2_obj  = 0;
+  trk1_obj  = 0;
+  trkh_obj  = 0;
+  calo1_obj = 0;
+  calo2_obj = 0;
+  tof_obj   = 0;
+  trig_obj  = 0;
+  s4_obj    = 0;
+  nd_obj    = 0;
+  ac_obj    = 0;
+  orb_obj   = 0;
+  //
+  // Reset run pointers
+  //
+  run_obj   = 0;//new GL_RUN();
+  soft_obj   = 0;// Emiliano
+  irun = -1;
+  runfirstentry = 0ULL;
+  runlastentry = 0ULL;    
+  //
 };
 
 
@@ -554,6 +687,7 @@
 		use_CAL            &&
 		calo2_obj->npcfit[1] > 15     &&   //no. of fit planes on Y view
 		calo2_obj->varcfit[1] < 1000. &&  //fit variance on Y view
+		cp && ci &&
 		true){
 
 		
@@ -575,7 +709,7 @@
 		cout << "void PamLevel2::SortTracks(TString how): how= "<<how<<" but ToFLevel2 not loaded !!!";
 		return;
 	    };
-	    if( use_TOF ){
+	    if( use_TOF && op && oi ){
 		
 		Int_t nphit_p =0;
 		Int_t nphit_i =0;
@@ -831,7 +965,12 @@
 
 //     if( !detlist.IsNull() ) SetWhichTrees(detlist);
 //     else                    GetWhichTrees(f);
-    
+  if ( pam_tree ){
+    printf("WARNING: TTree *PamLevel2::GetPamTree(TFile *fl, TString detlist) -- pam_tree already exists!\n ");
+    return pam_tree;
+  };
+  //
+
     cout << "TTree *PamLevel2::GetPamTree(TFile *f, TString detlist ) -- obsolte "<<endl;
 
     SetWhichTrees(detlist);
@@ -907,7 +1046,7 @@
     if(R && TRG) {
         R->SetBranchAddress("TrigLevel2", GetPointerTo("TrigLevel2"));
         cout << "Trigger      : set branch address TrigLevel2"<<endl;
-        if(!Trout)Trout=O;
+        if(!Trout)Trout=R;
         else Trout->AddFriend(R);
     }else{
         cout << "Trigger      : missing tree"<<endl;
@@ -917,7 +1056,7 @@
     if(S && S4) {
         S->SetBranchAddress("S4Level2", GetPointerTo("S4Level2"));
         cout << "S4           : set branch address S4Level2"<<endl;
-        if(!Trout)Trout=O;
+        if(!Trout)Trout=S;
         else Trout->AddFriend(S);
     }else{
         cout << "S4           : missing tree"<<endl;
@@ -927,7 +1066,7 @@
     if(N && ND) {
         N->SetBranchAddress("NDLevel2", GetPointerTo("NDLevel2"));
         cout << "NeutronD     : set branch address NDLevel2"<<endl;
-        if(!Trout)Trout=O;
+        if(!Trout)Trout=N;
         else Trout->AddFriend(N);
     }else{
         cout << "NeutronD     : missing tree"<<endl;
@@ -937,7 +1076,7 @@
     if(A && AC) {
         A->SetBranchAddress("AcLevel2", GetPointerTo("AcLevel2"));
         cout << "Anticounter  : set branch address AcLevel2"<<endl;
-        if(!Trout)Trout=O;
+        if(!Trout)Trout=A;
         else Trout->AddFriend(A);
     }else{
         cout << "Anticounter  : missing tree"<<endl;
@@ -947,7 +1086,7 @@
     if(B && ORB) {
 	B->SetBranchAddress("OrbitalInfo", GetPointerTo("OrbitalInfo"));
 	cout << "OrbitalInfo  : set branch address OrbitalInfo"<<endl;
-	if(!Trout)Trout=O;
+	if(!Trout)Trout=B;
 	else Trout->AddFriend(B);
     }else{
 	cout << "OrbitalInfo  : missing tree"<<endl;
@@ -968,9 +1107,9 @@
     };
     
     cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
-    
-    pam_tree = (TChain*)Trout;
 
+    pam_tree = (TChain*)Trout;
+    
     return Trout;
     
 }
@@ -989,10 +1128,13 @@
 	
     TString wdir = gSystem->WorkingDirectory();	
     
-    if(ddir=="")ddir = wdir;
+    //    if(ddir=="")ddir = wdir;
 //	TSystemDirectory *datadir = new TSystemDirectory(gSystem->BaseName(ddir),ddir);
-    cout << "Level2 data directory : "<<  ddir << endl;
-    
+    if ( ddir != ""){
+      cout << "Level2 data directory : "<<  ddir << endl;
+    } else {
+      cout << "Level2 data directory not given as input: trying to evaluate from list or taking working directory " << endl;
+    };
     TList *contents  = new TList; // create output list
     contents->SetOwner();
     
@@ -1008,6 +1150,7 @@
 // 	    return 0;
 // 	}	
 // 	flisttxt = fullpath;
+      if ( !flisttxt.EndsWith(".root") ){
 
 	flisttxt = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
 
@@ -1040,7 +1183,14 @@
 //	    if( gSystem->IsFileInIncludePath(file,&fullpath) ){
 //	    if( (fullpath = gSystem->FindFile(ddir,file)) ){
 	    if( file.EndsWith(".root") ){
-		char *fullpath = gSystem->ConcatFileName(gSystem->DirName(ddir),gSystem->BaseName(file));
+	      TString filedir;
+	      if (ddir != ""){
+		filedir = ddir; // take the input dir
+	      } else {
+		gSystem->ChangeDirectory(wdir); // back to the working directory
+		filedir = gSystem->DirName(file); // this will take the path if exist in the list otherwise it will return automatically the working dir
+	      };
+		char *fullpath = gSystem->ConcatFileName(gSystem->DirName(filedir),gSystem->BaseName(file));
 		contents->Add(new TSystemFile(fullpath,gSystem->DirName(fullpath)));// add file to the list
 		delete fullpath;
 	    }
@@ -1049,13 +1199,22 @@
 //	    };
 	};
 	in.close();
-	
+      } else {
+	  if(flisttxt.Contains("#"))flisttxt = flisttxt(0,flisttxt.First("#"));
+	  char *fullpath = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
+	  contents->Add(new TSystemFile(fullpath,gSystem->DirName(fullpath)));// add file to the list
+	  delete fullpath;
+      };	
     }else{
 	
 	cout << "No input file list given."<<endl;
 	cout << "Check for existing root files."<<endl;
 //		cout << "Warking directory: "<< gSystem->WorkingDirectory()<< endl;
-	
+	if ( ddir == "" ){
+	  ddir = wdir;
+	  cout << "Level2 data directory : "<<  ddir << endl;
+	};
+
 	TSystemDirectory *datadir = new TSystemDirectory(gSystem->BaseName(ddir),ddir);
 	TList *temp = datadir->GetListOfFiles();
 //		temp->Print();
@@ -1099,6 +1258,14 @@
  * @return Pointer to a TChain
  */
 TChain *PamLevel2::GetPamTree(TList *fl, TString detlist ){
+  //
+  //
+  //
+  if ( pam_tree ){
+    printf("WARNING: TChain *PamLevel2::GetPamTree(TList *fl, TString detlist) -- pam_tree already exists!\n ");
+    return pam_tree;
+  };
+  //
     
     TChain *Trout =0;
 
@@ -1119,16 +1286,16 @@
     if(ORB)cout<<"ORB ";
     cout << endl;
 
-    TChain *T = 0;	
-    TChain *C = 0;
-    TChain *O = 0;
-    TChain *R = 0;
-    TChain *S = 0;
-    TChain *N = 0;
-    TChain *A = 0;
-    TChain *B = 0;
+     TChain *T = 0;	
+     TChain *C = 0;
+     TChain *O = 0;
+     TChain *R = 0;
+     TChain *S = 0;
+     TChain *N = 0;
+     TChain *A = 0;
+     TChain *B = 0;
 
-    TChain *L = 0;
+     TChain *L = 0;
     
     if(TRK2||TRK1||TRKh) T = new TChain("Tracker");	
     if(CAL2||CAL1)       C = new TChain("Calorimeter");
@@ -1138,7 +1305,6 @@
     if(ND)               N = new TChain("NeutronD");
     if(AC)               A = new TChain("Anticounter");
     if(ORB)              B = new TChain("OrbitalInfo");
-
      L = new TChain("SelectionList");
     
     // loop over files and create chains	
@@ -1158,9 +1324,10 @@
 	    if(ORB)              B->Add(name);
 	    if(SELLI==1)         L->Add(name);
 	};
-    }
+    };
     
     cout << "done chain \n";
+    cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
 
 //    UInt_t *found=0;
 // Tracker
@@ -1175,7 +1342,7 @@
 //	else    T->SetBranchStatus("TrkHough",0,found);
  	if(TRKh)cout << "Tracker      : set branch address TrkHough"<<endl;
         if(!Trout)Trout=T;
-        else Trout->AddFriend("Tracker");
+	else Trout->AddFriend("Tracker");
     }else{
         cout << "Tracker      : missing tree"<<endl;
     };
@@ -1246,6 +1413,7 @@
     }else{
 	cout << "OrbitalInfo  : missing tree"<<endl;
     };
+    cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
 
     // Selection List
     if(L && SELLI==1) {
@@ -1257,6 +1425,7 @@
 	sel_tree = L;
 // 	if(!Trout)Trout=O;
 // 	else Trout->AddFriend("SelectionList");
+	cout << "----------------------------------------------------" <<endl;
     }else{
 //	cout << "SelectionList  : missing tree"<<endl;
 	if(L)L->Delete();
@@ -1448,8 +1617,15 @@
  * @return Pointer to a TChain
  */
 TChain *PamLevel2::GetRunTree(TList *fl){
-	
-    TChain *R = new TChain("Run");
+  //
+  //
+  //
+  if ( run_tree ){
+    printf("WARNING: TChain *PamLevel2::GetRunTree(TList *fl) -- run_tree already exists!\n ");
+    return run_tree;
+  };	
+  //
+  TChain *R = new TChain("Run");
     
     // loop over files and create chains	
     TIter next(fl);
@@ -1488,21 +1664,26 @@
  * @return Pointer to a TTree
  */
 TTree *PamLevel2::GetRunTree(TFile *f){
+  if ( run_tree ){
+    printf("WARNING: TTree *PamLevel2::GetRunTree(TFile *f) -- run_tree already exists!\n ");
+    return run_tree;
+  };
+	
 
     cout << "TTree *PamLevel2::GetRunTree(TFile *f) -- obsolte "<<endl;
 
-    TTree *R = (TTree*)f->Get("Run");
+    TTree *T = (TTree*)f->Get("Run");
     
-    if(R){
-	R->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));
+    if(T){
+	T->SetBranchAddress("RunInfo", GetPointerTo("RunInfo"));
 	cout << "Run         : set branch address RunInfo"<<endl;
-	R->SetBranchAddress("SoftInfo", GetPointerTo("SoftInfo")); // Emiliano
+	T->SetBranchAddress("SoftInfo", GetPointerTo("SoftInfo")); // Emiliano
 	cout << "Software    : set branch address SoftInfo"<<endl; // Emiliano
     }
 
-    run_tree = (TChain*)R;
+    run_tree = (TChain*)T;
 
-    return R;
+    return T;
     
 }
 /**
@@ -1510,36 +1691,100 @@
  * @param run Pointer to the chain/tree which contains run infos 
  * @return true if a new run has been read, false if it is still the same run
  */
-Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev){
+Bool_t PamLevel2::UpdateRunInfo(TChain *run, Long64_t iev){
   //
   // check if we have already called once GetEntry, if not call it
   //
-  if ( run->GetEntries() <= 0 ) return(false);
+    cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, Long64_t iev) --- NON FUNZIONA BENISSIMO.... "<<endl;
+    if(!run){
+	  cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing RunInfo tree "<<endl;
+	  return(false);	
+    }
+    if ( run->GetEntries() <= 0 ) return(false);
   //
   
-  Int_t oldrun = irun;
+  //  Int_t oldrun = irun;
+  Long64_t oldrun = irun;
+
   // --------------------------------------
   // if it is a full file (not preselected)
   // --------------------------------------
   if(SELLI==0){
-      if ( irun < 0 ){
-	  irun = 0;
-	  run->GetEntry(0);
-	  runfirstentry = 0ULL;
-	  runlastentry += (ULong64_t)(this->GetRunInfo()->NEVENTS) - 1ULL;
-      };
-      while ( iev > (runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS-1)) && irun < run->GetEntries() ){
-	  //    printf(" iev %llu %u %llu \n",iev,this->GetRunInfo()->NEVENTS,(ULong64_t)(runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS)));
+
+      //
+      // the absolute time is necessary to relate the event with the run
+      //
+      if( !GetOrbitalInfo() ){
+	  cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing OrbitalInfo "<<endl;
+	  return(false);
+      }
+
+      //
+      // the first time the routine is called, set run search from the beginning
+      //
+      if ( irun < 0LL ){
+	  irun = 0LL; 
+	  run->GetEntry(irun);
+ 	  runfirstentry = 0LL;
+ 	  runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
+ 	  if ( (Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL ) runlastentry -= 1LL;
+      };      
+      //
+       if ( irun == run->GetEntries()-1LL && 
+	   !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && 
+	     GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) 
+	    ){
+	 irun = -1LL;
+	 runfirstentry = 0LL;
+	 runlastentry = -1LL;
+       };
+      // modificato il controllo sull'aggiornamento del run, per evitare problemi
+      // dovuti agli eventi annidati (NB! NEVENTS conta anche questi!!)
+      //
+      bool fromfirst = true;
+      //
+      while ( !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) && irun < run->GetEntries()-1LL ){
+//      while ( iev > (runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS-1)) && irun < run->GetEntries() ){
 	  irun++;
 	  run->GetEntry(irun);
-	  runfirstentry = runlastentry+1ULL;
-	  runlastentry += (ULong64_t)(this->GetRunInfo()->NEVENTS);
+	  runfirstentry = runlastentry;
+	  if ( (Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL ) runfirstentry += 1LL;
+	  runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
+// 	  cout << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+// 	  cout << "runfirstentry "<<runfirstentry<<endl;
+	  //	  printf(" iev %llu %u %llu \n",iev,this->GetRunInfo()->NEVENTS,(ULong64_t)(runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS)));
+	  //	  printf(" abstime %u trailertime %u \n",GetOrbitalInfo()->absTime,GetRunInfo()->RUNTRAILER_TIME);
+	  //	  printf(" IDRUN %u \n",GetRunInfo()->ID);
+	  //
+// 	  prevshift = 0;
+	  //
+	  if ( irun == (Long64_t)(run->GetEntries()-1LL) && fromfirst && !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME)){
+	      printf(" resetting irun  (it should NOT happen!!!)\n");
+	      fromfirst = false;
+	      irun = 0;
+	      run->GetEntry(irun);
+	      runfirstentry = 0ULL;
+	      runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
+	      if ( (Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL ) runlastentry -= 1LL;
+	  };
+	  //
       };
       //
+      if ( 
+	   !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && 
+	     GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) 
+	  ) {
+	  printf(" Something very wrong here: cannot find RUN containing absolute time %u \n",GetOrbitalInfo()->absTime);
+	  return false;
+      }
+      //
       if ( irun == oldrun || irun >= run->GetEntries() ) return(false);
       //
       //  printf(" iev %llu irun %i nevents %u 1st %llu last %llu \n",iev,irun,this->GetRunInfo()->NEVENTS,(ULong64_t)runfirstentry,(ULong64_t)runlastentry);
       //
+      prevshift = 0;
+      cout << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+//      cout << "runfirstentry "<<runfirstentry<<endl;
       return(true);    
   };
   // ----------------------------------------------------
@@ -1548,8 +1793,11 @@
   // ----------------------------------------------------
   if(SELLI==1){      
       sel_tree->GetEntry(iev);
+//      cout << irun << " "<< irunentry << endl;
       if(irun != oldrun){
 	  run->GetEntry(irun);
+	  cout << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+	  prevshift = 0;
 	  return true;
       }
       return false;
@@ -1558,12 +1806,119 @@
   return false;
   //
 };
+
+Bool_t PamLevel2::UpdateRunInfo(Long64_t iev){
+
+    if(!run_tree){
+	cout << " Bool_t PamLevel2::UpdateRunInfo(ULong64_t iev) -- ERROR -- run tree not loaded"<<endl;
+	return false;
+    }
+    if ( run_tree->GetEntries() <= 0 ) {
+	cout << " Bool_t PamLevel2::UpdateRunInfo(ULong64_t iev) -- ERROR -- run tree is empty"<<endl;
+	return(false);
+    }
+  
+    Int_t oldrun = irun; // store current run index
+
+    // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
+    // if it is a full file (not preselected)
+    // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
+    if(SELLI==0){
+
+	// ---------------------------------------------------------------
+	// the absolute time is necessary to relate the event with the run
+	// ---------------------------------------------------------------
+	if( !GetOrbitalInfo() ){
+	    cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- ERROR -- missing OrbitalInfo "<<endl;
+	    return(false);
+	}
+      
+	// -----------------------------------------------------------------------
+	// the first time the routine is called, set run search from the beginning
+	// -----------------------------------------------------------------------
+	if ( irun < 0 ){
+	    irun = 0LL;
+	    run_tree->GetEntry(irun);
+	};      
+	//
+	bool fromfirst = true; // first loop over runs
+	// ------------------------------------------------------
+	// loop over runs to find the one that contains the event 
+	// ------------------------------------------------------
+	while ( !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME &&    // check on absolute time (s)
+		  GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) && 
+		!(GetOrbitalInfo()->OBT >= GetRunInfo()->RUNHEADER_OBT &&         // additional check on OBT (ms)
+		  GetOrbitalInfo()->OBT <= GetRunInfo()->RUNTRAILER_OBT) && 
+		irun < run_tree->GetEntries() ){
+	    irun++;
+	    // ------------------------------------
+	    // if the end of run tree is reached...
+	    // ------------------------------------
+	    if( irun == run_tree->GetEntries() ){
+		if(!fromfirst){
+		    // -----------------------------------------------------
+		    // if it happened already once and the run was not found
+		    // ---> exit with error
+		    // -----------------------------------------------------
+		    cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- ERROR -- event entry #"<<iev<<" does not belong to any run (should not happen)" <<endl;
+		    return false;
+		}
+		// -----------------------------------------
+		// ...otherwise repeat search from beginning
+		// -----------------------------------------
+		cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- WARNING -- reached end of run tree. searchin again from beginning " <<endl;
+		fromfirst = false;
+		irun = 0LL;
+		runfirstentry = 0LL;
+	    }
+	    // -------------------------------------------------------------------
+	    // save the index of the first entry of the run, relative to pam_tree,
+	    // and read a new run
+	    // -------------------------------------------------------------------
+	    if(irun>0)runfirstentry += (GetRunInfo()->NEVENTS);
+	    run_tree->GetEntry(irun);	   
+	    if(GetRunInfo()->RUNHEADER_OBT>=GetRunInfo()->RUNTRAILER_OBT ){
+		cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- WARNING -- irun "<<irun<<"  has RUNHEADER_OBT>=RUNTRAILER_OBT " <<endl;
+		cout << "                                                            (NB!! in this case some events are assigned to a wrong run)"<<endl;
+	    }
+	};
+	// --------------------------------------
+	// if there was no need to update the run
+	// ---> exit with FALSE
+	// --------------------------------------
+	if ( irun == oldrun ) return(false);
+
+	// --------------------------------------
+	// ... otherwise 
+	// ---> exit with TRUE
+	// --------------------------------------
+	cout << endl << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+	prevshift = 0;
+	return(true);    
+    };
+    // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
+    // if it is a preselected file (there is SelectionList)
+    // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
+    if(SELLI==1){      
+	sel_tree->GetEntry(iev);
+	if(irun != oldrun){
+	    run_tree->GetEntry(irun);
+	    cout << endl << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+	    prevshift = 0;
+	    return true;
+	}
+	return false;
+    }
+
+    return false;
+    //
+};
 /**
  * Update the runinfo informations (to be used to have Run infos event by event basis)
  * @param run Pointer to the chain/tree which contains run infos 
  * @return true if a new run has been read, false if it is still the same run
  */
-Bool_t PamLevel2::UpdateRunInfo(TTree *run, ULong64_t iev){
+Bool_t PamLevel2::UpdateRunInfo(TTree *run, Long64_t iev){
   return(UpdateRunInfo((TChain*)run,iev));
 };
 
@@ -2198,12 +2553,22 @@
     cout << "Run          : branch RunInfo"<<endl;
     run_tree_clone->Branch("SoftInfo","SoftInfo",GetPointerTo("SoftInfo"));
     cout << "Run          : branch SoftInfo"<<endl;
-	    
+    // ------------------
+    // replicate run tree
+    // ------------------
+    cout << "----------------------------------------------------"<<endl;
+    cout << "irun\t | RUN\t NEVENTS\t absolute time"<<endl;
+    for (Int_t i=0; i<run_tree->GetEntries(); i++){
+	run_tree->GetEntry(i);
+	cout << i<< "\t | "<<GetRunInfo()->ID<<"\t "<<GetRunInfo()->NEVENTS<< "\t "<<GetRunInfo()->RUNHEADER_TIME<<" <---> "<<GetRunInfo()->RUNTRAILER_TIME<<endl;
+	run_tree_clone->Fill();
+    }
+    cout << "----------------------------------------------------"<<endl;
 
 
     sel_tree_clone = new TTree("SelectionList","List of selected events ");
-    sel_tree_clone->Branch("RunEntry",&irun,"runentry/I");
-    sel_tree_clone->Branch("EventEntry",&irunentry,"eventry/I");
+    sel_tree_clone->Branch("RunEntry",&irun,"runentry/L");
+    sel_tree_clone->Branch("EventEntry",&irunentry,"eventry/L");
     
 
     Int_t i=0;
@@ -2213,6 +2578,7 @@
 	    pam_tree_clone[i]->Branch("TrkLevel1","TrkLevel1", GetPointerTo("TrkLevel1"));
 	    pam_tree_clone[i]->BranchRef();
 	    cout << "Tracker      : branch TrkLevel1"<<endl;
+//	    cout << "CreateCloneTrees " << GetTrkLevel1()<<endl;
 	};
 	if(TRK2) {
 	    pam_tree_clone[i]->Branch("TrkLevel2", "TrkLevel2",GetPointerTo("TrkLevel2"));
@@ -2294,16 +2660,11 @@
 void PamLevel2::FillCloneTrees(){
     
 //    cout << "PamLevel2::FillCloneTrees()" << irunentry << endl;
+
     for(Int_t i=0; i<NCLONES; i++){
 	if(pam_tree_clone[i])pam_tree_clone[i]->Fill();
     }
     if(sel_tree_clone)sel_tree_clone->Fill();    
-//    if( irunentry == 0 || run_tree_clone->GetEntries()==0 )run_tree_clone->Fill();
-//    Int_t nstoredruns = run_tree_clone->GetEntries();
-//     if( irun ==  nstoredruns )run_tree_clone->Fill();
-//     else if( irun > nstoredruns || irun < nstoredruns-1){
-// 	cout << " PamLevel2::FillCloneTrees() -- ERROR -- current run "<< irun <<" stored runs "<< nstoredruns <<endl;
-//     }
 
 }
 
@@ -2345,35 +2706,64 @@
 }
 
 /**
- * Method to get both level2-trees entry and corresponding run entry.
+ * Method to get level2-trees entry, the corresponding run entry and (if required) the level0 entry.
  */
-
-
-Int_t PamLevel2::GetEntry(Int_t iee){
+//Int_t PamLevel2::GetEntry(Int_t iee){
+Int_t PamLevel2::GetEntry(Long64_t iee){
     
     if(!pam_tree){
 	cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- level2 trees not loaded"<<endl;
 	return 0;
     }
-    if(!run_tree ){
-	cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- run tree not loaded"<<endl;
-	return 0;
-    }
 
-    Int_t ii=0;
+
+    //
+    // This is a sort of bug: if you don't have the run tree you don't want to exit here you want to have loaded the event anyway...
+    //
+    //    if(!run_tree ){
+    //	cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- run tree not loeaded"<<endl;
+    //	return 0;
+    //    }
+
+    Long64_t ii=0;
     //-------------------------------
     ii = iee;
-    if( !pam_tree->GetEntry(ii) ) return 0;
+    if( !pam_tree->GetEntry(ii) ){	
+	cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading pam tree"<<endl;
+	return 0;
+    }
+    //
+    // ... that's way I put it here. Notice that nothing change in the code (is backward compatible) since in any case you return with 0. 
+    // in theory one would like to return 1 if run is not loaded but now I don't have the will to add that 2 lines of code and it is not
+    // a problem if you don't check the return code of getentry.
+    //
+    if(!run_tree ){
+	if ( TRK0 || CAL0 || TOF0 || RUN ) { //forse cosi` va bene per tornare 1?
+	    cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- run tree not loaded"<<endl;
+	    return 0;
+	}  else {
+	    return 1; //cosi` se non c'e` run esce qua...
+	}
+    }
+
     //-------------------------------
     ii = iee;
-    Bool_t UPDATED = UpdateRunInfo(run_tree,ii);
+//    Bool_t UPDATED = UpdateRunInfo(run_tree,ii);
+//    Bool_t UPDATED = UpdateRunInfo(ii);
+    UpdateRunInfo(ii);
     if(SELLI==0)irunentry = iee-runfirstentry;
-    if(UPDATED && run_tree_clone)run_tree_clone->Fill();
-
+//    if(UPDATED && run_tree_clone)run_tree_clone->Fill();
+   
 //    cout << "PamLevel2::GetEntry("<<iee<<") "<<irun<<" "<<runfirstentry<<" "<<irunentry<<endl;
 
-    if( TRK0 || CAL0 || TOF0 )GetYodaEntry( );
+//    cout << " irunentry "<<irunentry << endl;
 
+    if( TRK0 || CAL0 || TOF0 ){
+	if( !GetYodaEntry( ) ){
+	    cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading level0 tree"<<endl;
+	    return 0;
+	}
+    }
     return 1;
 
 }
@@ -2392,15 +2782,13 @@
     // check if iroot has changed
     //===================================
     if( irun<0 ){
-	cout << "PamLevel2::GetYodaTree() -- ERROR "<<endl;
-	cout << "In order to use this method you have to load the RunInfo tree "<<endl;
-	cout << "with the method TChain* PamLevel2::GetRunTree(TString, TString)"<<endl;
-//	cout << " - read the event with PamLevel2::GetEntry(Int_t)"<<endl;
+	cout << "PamLevel2::GetYodaTree() -- ERROR -- irun = "<<irun<<endl;
+//	cout << "In order to use this method you have to first load the RunInfo tree "<<endl;
 	return NULL;
     }    
     Int_t irootnew = run_obj->ID_ROOT_L0;
-//    cout << "iroot    "<<iroot<<endl;
-//    cout << "irootnew "<<irootnew<<endl;
+//     cout << "iroot    "<<iroot<<endl;
+//     cout << "irootnew "<<irootnew<<endl;
 
     //===================================
     // load the level0 file
@@ -2427,7 +2815,10 @@
 //	    cout<<"DB already connected"<<endl;
 	}
 	GL_ROOT glroot = GL_ROOT();
-	if( glroot.Query_GL_ROOT(iroot,dbc) )return NULL;
+	if( glroot.Query_GL_ROOT(iroot,dbc) ){
+	    cout << "TTree* PamLevel2::GetYodaTree( ) -- ERROR -- level0 file iroot = "<<iroot<< " does not exists"<<endl;
+	    return NULL;
+	};
 	TString filename = glroot.PATH + glroot.NAME;
 	if(l0_file){ 
 	    l0_file->Close();
@@ -2444,6 +2835,7 @@
 	l0_tree = (TTree*)l0_file->Get("Physics");
 	if(!h0_obj)h0_obj = new EventHeader();
 	l0_tree->SetBranchAddress("Header" ,&h0_obj);
+	prevshift = 0;
 	//---------------------------------------------------
 	// TRACKER:
 	if(TRK0){
@@ -2452,12 +2844,16 @@
 		trk0_obj->Set();
 	    };
 	    l0_tree->SetBranchAddress("Tracker" ,trk0_obj->GetPointerToTrackerEvent());
-	    TrkParams::SetCalib(run_obj,dbc);
 	}
 	//---------------------------------------------------
 	// CALORIMETER:
 	if(CAL0){
-	    cout << "PamLevel2::GetYodaTree() --- level0 calorimeter not implemented "<<endl;
+	    if(!calo0_obj){
+		calo0_obj = new CaloLevel0();
+		calo0_obj->Set();
+	    };
+	    l0_tree->SetBranchAddress("Calorimeter" ,calo0_obj->GetPointerToCalorimeterEvent());
+	    //	    cout << "PamLevel2::GetYodaTree() --- level0 calorimeter not implemented "<<endl;
 	}
 	//---------------------------------------------------
 	// TOF:
@@ -2467,6 +2863,24 @@
 
     };
 
+    if(!dbc || (dbc && !dbc->IsConnected())){
+	cout << " TTree* PamLevel2::GetYodaTree( ) -- no DB connected... hai fatto qualche cazzata "<<endl;
+    }
+
+    if ( TRK0 ){
+	TrkParams::Load(6);
+	if( !TrkParams::IsLoaded(6) ){
+	    cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- VK-mask not loaded"<<endl;
+	};
+	TrkParams::SetCalib(run_obj,dbc);
+	TrkParams::LoadCalib( );
+	if( !TrkParams::CalibIsLoaded() ){
+	    cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- Calibration not loaded"<<endl;
+	};
+    }
+
+//    cout << l0_tree << endl;
+    
     return l0_tree;
 
 }
@@ -2479,17 +2893,86 @@
 //    cout << "Int_t PamLevel2::GetYodaEntry()"<<endl;
     if(!GetYodaTree())return 0;
     
+    // patch
+    if( irunentry < 0){
+//	cout << "Int_t PamLevel2::GetYodaEntry() -- ATTENZIONE -- irunentry negativo?!?! "<<(Int_t)irunentry<<endl;
+	irunentry=0LL;
+    }
     //  ---------------------------------
     //  if file is NOT a preselected file
     //  ---------------------------------
-    Int_t quellagiusta = irunentry + run_obj->EV_FROM;
-    //  ------------------------------------------
-    //  otherwise read the "preselected-list" tree
-    //  ------------------------------------------
+    Long64_t quellagiusta = irunentry + (Long64_t)(run_obj->EV_FROM);
+//     cout << " irunentry "<<irunentry<<endl;
+//     cout << " EV_FROM "<<run_obj->EV_FROM<<endl;
+//     cout << " quellagiusta = irunentry + EV_FROM "<< quellagiusta << endl;
+
+//     cout << " irun "<< irun << " irunentry "<< irunentry<<" run_obj->EV_FROM "<<run_obj->EV_FROM <<" quella giusta "<<quellagiusta << endl;
+//     cout << " iroot "<<iroot<<" run_obj->ID_ROOT_L0 "<<run_obj->ID_ROOT_L0<<endl;
+//     cout << " time "<< GetOrbitalInfo()->absTime << endl;
+//     cout << " trk_calib_used "<<run_obj->TRK_CALIB_USED<< endl;
+    
+    if( !GetOrbitalInfo() ){
+	cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing OrbitalInfo "<<endl;
+	return 0;
+    }
+    if( GetOrbitalInfo()->OBT==0 && GetOrbitalInfo()->pkt_num==0 ){
+	cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- level2 event corrupted ?? "<<endl;	
+	return 0;
+    }
+
+    // ---------------------------------------------------------------------
+    // ATTENTION!!!
+    // If data are not pre-processed with cleaner, the level0 tree may contain
+    // spurious nested physics packets.
+    // The GL_RUN variables EV_FROM, EV_TO and NEVENTS counts also these entries
+    // while level2 tree DOES NOT!!
+    // This means that "quellagiusta" in these cases is not correct.
+    // In order to retrieve the correct level0 event, I implemented a check
+    // of the OBT and pkt-number. In case of mismatch, the level0 entry number
+    // is shift forward until when the packets match.
+    // ---------------------------------------------------------------------
+    Int_t answer = 0;
+    Int_t shift =0;
+    //    printf(" siamo qui %i %i \n",shift,prevshift);
+    Int_t maxshift = 100;
+    do{
+	if(shift>0){	 
+	    cout << " PKTNUM  L2 --- "<< GetOrbitalInfo()->pkt_num << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetCounter()<<endl;
+	    cout << "         RUN: ID "<< GetRunInfo()->ID << " ID_ROOT_L0 "<<run_obj->ID_ROOT_L0<<" ID_RUN_FRAG "<<GetRunInfo()->ID_RUN_FRAG << " EV_FROM "<<GetRunInfo()->EV_FROM  <<endl;
+	    cout << "         L2 <--> L0 mismatch ( irun "<<irun<<" irunentry "<<irunentry<<" shift "<<shift<<" prevshift "<<prevshift<<" )"<<endl;
+	}
+	answer = l0_tree->GetEntry(quellagiusta+(Long64_t)shift+(Long64_t)prevshift);
+	shift++;
+	if( !GetEventHeader() ){
+	    cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing EventHeader "<<endl;
+	    return 0;
+	}
+//	cout << "PKTNUM "<<shift<<" ==  L2 --- "<< GetOrbitalInfo()->pkt_num << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetCounter()<<endl;
+//	cout << " L2 --- "<< GetOrbitalInfo()->OBT << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetOrbitalTime()<<endl;
+// 	if( (quellagiusta+shift) == l0_tree->GetEntries()+1 )cout << ">>> end of level0 tree <<<"<<endl; 
+// 	cout << " GetOrbitalInfo()->OBT "<< GetOrbitalInfo()->OBT << endl;
+// 	cout << " GetEventHeader()->GetPscuHeader()->GetOrbitalTime() "<< GetEventHeader()->GetPscuHeader()->GetOrbitalTime() << endl;
+// 	cout << " GetOrbitalInfo()->pkt_num "<< GetOrbitalInfo()->pkt_num << endl;
+// 	cout << " GetEventHeader()->GetPscuHeader()->GetCounter() "<< GetEventHeader()->GetPscuHeader()->GetCounter() << endl;
+//	printf(" IDRUN %u \n",GetRunInfo()->ID);
+//
+	if ( prevshift != 0 && (quellagiusta+(Long64_t)shift) == GetYodaTree()->GetEntries() ){
+	  prevshift = 0;
+	  shift = -1;
+	};
 
+    }while( ( GetOrbitalInfo()->OBT != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) || GetOrbitalInfo()->pkt_num != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter())) && (quellagiusta+(Long64_t)shift) < GetYodaTree()->GetEntries() && shift < maxshift);
+
+    if ( (quellagiusta+(Long64_t)shift) == GetYodaTree()->GetEntries() || shift == maxshift ) {
+	cout << " Big trouble here, no such event in Level0 data! " <<endl;
+	return 0;
+    }
 //    cout << "LA ENTRY GIUSTA E`: "<<quellagiusta<<" (spero...)"<<endl;
-    return GetYodaTree()->GetEntry(quellagiusta);
+//    return GetYodaTree()->GetEntry(quellagiusta);
+    if ( shift > 1 ) prevshift += (shift-1);
     
-    return 1;
+    return answer;
     
 }
+
+