--- PamelaLevel2/src/PamLevel2.cpp	2007/03/08 15:25:27	1.23
+++ PamelaLevel2/src/PamLevel2.cpp	2007/03/21 09:07:32	1.33
@@ -103,6 +103,7 @@
     
     h0_obj    = 0;
     trk0_obj  = 0;
+    calo0_obj  = 0;
 
     trk2_obj  = 0;
     trk1_obj  = 0;
@@ -118,22 +119,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 +190,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;
@@ -241,7 +244,8 @@
 //    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(trkh_obj) trkh_obj->Clear();
@@ -554,6 +558,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 +580,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;
@@ -968,9 +973,9 @@
     };
     
     cout<<endl<<" Number of entries: "<<Trout->GetEntries()<<endl<<endl;
-    
-    pam_tree = (TChain*)Trout;
 
+    pam_tree = (TChain*)Trout;
+    
     return Trout;
     
 }
@@ -1008,6 +1013,7 @@
 // 	    return 0;
 // 	}	
 // 	flisttxt = fullpath;
+      if ( !flisttxt.EndsWith(".root") ){
 
 	flisttxt = gSystem->ConcatFileName(gSystem->DirName(flisttxt),gSystem->BaseName(flisttxt));
 
@@ -1049,7 +1055,11 @@
 //	    };
 	};
 	in.close();
-	
+      } else {
+	  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;
@@ -1510,36 +1520,83 @@
  * @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);
   //
   
-  Int_t oldrun = irun;
+//  Int_t oldrun = irun;
+  Long64_t oldrun = irun;
   // --------------------------------------
   // if it is a full file (not preselected)
   // --------------------------------------
   if(SELLI==0){
+
+      if( !GetOrbitalInfo() ){
+	  cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing OrbitalInfo "<<endl;
+	  return(false);
+      }
+
       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)));
+	  run->GetEntry(irun);
+ 	  runfirstentry = 0LL;
+ 	  runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
+ 	  if ( (Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL ) runlastentry -= 1LL;
+// 	  cout << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+// 	  cout << "runfirstentry "<<runfirstentry<<endl;
+// 	  return(true); 
+      };      
+
+      // 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()-1 ){
+//      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 == run->GetEntries()-1 && 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 ( !fromfirst && 
+	   !(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);    
   };
   // ----------------------------------------------------
@@ -1550,6 +1607,8 @@
       sel_tree->GetEntry(iev);
       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 +1617,89 @@
   return false;
   //
 };
+
+// Bool_t PamLevel2::UpdateRunInfo(ULong64_t iev){
+//   //
+//   // check if we have already called once GetEntry, if not call it
+//   //
+//     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;
+//   // --------------------------------------
+//   // if it is a full file (not preselected)
+//   // --------------------------------------
+//   if(SELLI==0){
+
+//       if( !GetOrbitalInfo() ){
+// 	  cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing OrbitalInfo "<<endl;
+// 	  return(false);
+//       }
+
+//       if ( irun < 0 ){
+// 	  irun = 0;
+// 	  run_tree->GetEntry(irun);
+// 	  runfirstentry = iev;
+// 	  if( iev != 0){
+// 	      cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- WARNING -- "<<endl; 
+// 	  }
+//       };      
+
+//       bool fromfirst = true;
+
+//       while ( !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) && irun < run->GetEntries() ){
+// 	  irun++;
+// 	  if( irun == run->GetEntries() ){
+// 	      if(!fromfirst){
+// 		  cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- event entry #"<<iev<<" does not belong to any run (should not happen)" <<endl;
+// 		  return false;
+// 	      }
+// 	      cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- reached end of run tree. searchin again from beginning (should not happen)" <<endl;
+// 	      fromfirst = false;
+// 	      irun =0;
+// 	  }
+// 	  run_tree->GetEntry(irun);
+// 	  runfirstentry = iev;
+//       };
+//       //
+//       if ( irun == oldrun ) return(false);
+//       //
+//       cout << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+//       cout << "runfirstentry "<<runfirstentry<<endl;
+//       prevshift = 0;
+//       return(true);    
+//   };
+//   // ----------------------------------------------------
+//   // if it is a preselected file (there is SelectionList)
+//   // NBNB - the event tree MUST be read first 
+//   // ----------------------------------------------------
+//   if(SELLI==1){      
+//       sel_tree->GetEntry(iev);
+//       if(irun != oldrun){
+// 	  run->GetEntry(irun);
+// 	  cout << " ))))) 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));
 };
 
@@ -2213,6 +2349,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 +2431,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,30 +2477,50 @@
 }
 
 /**
- * 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;
     }
 
-    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(!run_tree ){
-	cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- run tree not loaded"<<endl;
+    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);
     if(SELLI==0)irunentry = iee-runfirstentry;
     if(UPDATED && run_tree_clone)run_tree_clone->Fill();
 
@@ -2401,8 +2553,8 @@
 	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
@@ -2429,7 +2581,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();
@@ -2446,6 +2601,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){
@@ -2454,12 +2610,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:
@@ -2469,6 +2629,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;
 
 }
@@ -2481,17 +2659,75 @@
 //    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 << " 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;
+    }
+
+    // ---------------------------------------------------------------------
+    // 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);
+    do{
+	if(shift>0){	 
+	    cout << " level0 <--> level2 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() );
+
+    if ( (quellagiusta+(Long64_t)shift) == GetYodaTree()->GetEntries() ) cout << " Big trouble here, no such event in Level0 data! " <<endl;
 
 //    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;
     
 }
+
+