--- PamelaLevel2/src/PamLevel2.cpp	2007/03/28 15:29:14	1.37
+++ PamelaLevel2/src/PamLevel2.cpp	2007/09/12 09:25:22	1.46
@@ -11,6 +11,8 @@
     calo_track = 0;
     tof_track  = 0;
     candeleteobj = 0;
+    pscore = 0;
+    iscore = 0;
 };
 //--------------------------------------
 //
@@ -60,6 +62,9 @@
 	calo_track = 0;
 	tof_track  = 0;	
     }
+    pscore = 0;
+    iscore = 0;
+
 }
 void PamTrack::Delete(){
 //    cout << "PamTrack::Delete() "<<candeleteobj<<endl;
@@ -112,18 +117,6 @@
 
 void PamLevel2::Initialize(){
 	
-//     trk2_obj  = TrkLevel2::GetTrkLevel2();
-//     trk1_obj  = TrkLevel1::GetTrkLevel1();
-//     trkh_obj  = TrkHough::GetTrkHough();
-//     calo1_obj = CaloLevel1::GetCaloLevel1();
-//     calo2_obj = CaloLevel2::GetCaloLevel2();
-//     tof_obj   = ToFLevel2::GetToFLevel2();
-//     trig_obj  = TrigLevel2::GetTrigLevel2();
-//     s4_obj    = S4Level2::GetS4Level2();
-//     nd_obj    = NDLevel2::GetNDLevel2();
-//     ac_obj    = AcLevel2::GetAcLevel2();
-//     orb_obj   = OrbitalInfo::GetOrbitalInfo();
-    
     h0_obj    = 0;
     trk0_obj  = 0;
     calo0_obj  = 0;
@@ -162,6 +155,9 @@
     pam_tree = NULL;
     for(Int_t i=0; i<NCLONES; i++ )pam_tree_clone[i]=NULL;
 
+    totdltime[0] = 0LL;
+    totdltime[1] = 0LL;
+
     host = "mysql://localhost/pamelaprod";
     user = "anonymous";
     psw = "";
@@ -198,6 +194,8 @@
 
     SELLI = -1;
 
+    ISGP = false;
+
     tsorted=0;
     timage=0;
     
@@ -304,10 +302,10 @@
 
     if(h0_obj)   h0_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();
+    if(calo0_obj) calo0_obj->Clear();	
     if(calo1_obj)calo1_obj->Clear();
     if(calo2_obj)calo2_obj->Clear();
     if(tof_obj)  tof_obj->Clear();
@@ -401,8 +399,23 @@
   runfirstentry = 0ULL;
   runlastentry = 0ULL;    
   //
+  totdltime[0] = 0LL;
+  totdltime[1] = 0LL;
+  //
 };
 
+Bool_t PamLevel2::IsGood(){
+  Bool_t goodev=true;
+  //  if(trk2_obj && trk2_obj->UnpackError() != 0 ) goodev = false; 
+  if(calo2_obj && calo2_obj->good != 1) goodev = false;
+  if(tof_obj && tof_obj->unpackError != 0) goodev = false;  
+  if(trig_obj && trig_obj->unpackError != 0) goodev = false; 
+  if(s4_obj && s4_obj->unpackError != 0) goodev = false;   
+  if(nd_obj && nd_obj->unpackError != 0) goodev = false;   
+  if(ac_obj && ac_obj->unpackError != 255) goodev = false;   
+    //  if(orb_obj)  
+  return goodev;
+};
 
 //--------------------------------------
 //
@@ -623,7 +636,7 @@
 void PamLevel2::SortTracks(){
   TString how = howtosort;
 
-  //    cout <<" PamLevel2::SortTracks(TString how) "<<endl;
+  //  cout <<" PamLevel2::SortTracks(TString how) "<<endl;
   if( !trk2_obj ){
     cout << "void PamLevel2::SortTracks():  TrkLevel2 not loaded !!!";
     return;
@@ -646,21 +659,41 @@
   TClonesArray &ttimage = *timage;
 
 
-  // loop over the tracks sorted by the tracker
+
+  //--------------------------------------------------
+  // retrieve sorting method
+  //--------------------------------------------------
   Bool_t use_TRK = how.Contains("TRK", TString::kIgnoreCase);
   Bool_t use_CAL = how.Contains("CAL", TString::kIgnoreCase);
   Bool_t use_TOF = how.Contains("TOF", TString::kIgnoreCase);
-    
+  Bool_t use_S1 = how.Contains("S1", TString::kIgnoreCase);
+  Bool_t use_S2 = how.Contains("S2", TString::kIgnoreCase);
+  Bool_t use_S3 = how.Contains("S3", TString::kIgnoreCase);
+  
+  if ( use_TOF ){
+    use_S1 = true;
+    use_S2 = true;
+    use_S3 = true;
+  };
   if( !CAL2 &&  use_CAL) use_CAL = false;
-  if( !TOF &&  use_TOF) use_TOF = false;
-    
+  if( !TOF ){
+    use_TOF = false;
+    use_S1  = false;
+    use_S2  = false;
+    use_S3  = false;
+  }
+
   if( !TRK2 ){
     //	cout << "SortTracks() : without tracker does not work!!! (not yet)" << endl;
     return;
   };
 
   //   cout << "use_CAL "<<use_CAL<<" use_TOF "<<use_TOF<<" use_TRK "<<use_TRK <<endl;
-    
+  
+
+  //--------------------------------------------------
+  // loop over "physical" tracks sorted by the tracker
+  //--------------------------------------------------
   for(Int_t i=0; i < trk2_obj->TrkLevel2::GetNTracks(); i++){
 	
     TrkTrack   *ts = 0;
@@ -668,15 +701,21 @@
     ToFTrkVar  *os = 0;
 	
     // get tracker tracks
-    TrkTrack   *tp = trk2_obj->TrkLevel2::GetTrack(i);                    //tracker
+    TrkTrack   *tp = trk2_obj->TrkLevel2::GetTrack(i); //tracker
     CaloTrkVar *cp = GetCaloStoredTrack(tp->GetSeqNo());
     ToFTrkVar  *op = GetToFStoredTrack(tp->GetSeqNo());
 
-    TrkTrack   *ti = 0;              //tracker (image)
+    TrkTrack   *ti = 0; //tracker (image)
     CaloTrkVar *ci = 0;
     ToFTrkVar  *oi = 0;
     //	cout << "trk track n. "<<i << " "<<hex<< tp <<dec<< endl;
     // if track has an image, check image selection
+
+    Int_t tp_score = 0;  //main track sorted by the tracker
+    Int_t ti_score = 0;  //image track
+    Int_t totp_score = 0;  //main track sorted by the tracker
+    Int_t toti_score = 0;  //image track
+
     if(tp->HasImage()){
 	    
       ti = trk2_obj->TrkLevel2::GetTrackImage(i);              //tracker (image)
@@ -686,46 +725,72 @@
       //	    cout << "its image "<<i << " "<<hex<< ti <<dec<< endl;
 
       //assign starting scores
-      Int_t tp_score = 0;  //main track sorted by the tracker
-      Int_t ti_score = 0;  //image track
+      tp_score = 0;  //main track sorted by the tracker
+      ti_score = 0;  //image track
 	    
-      // ------------------------
+      // -----------------------------------------------------------------------------------------
       // calorimeter check
-      // ------------------------
+      // -----------------------------------------------------------------------------------------
       // check the Y spatial residual on the first calorimeter plane
       // (cut on calorimeter variables from Emiliano)
       if( use_CAL && !calo2_obj ){
 	cout << "void PamLevel2::SortTracks(): howtosort= "<<how<<" but CaloLevel2 not loaded !!!";
 	return;
       };
+      if( use_CAL && !cp &&  ci ){
+	ti_score++;
+	toti_score++;
+      };
+      if( use_CAL &&  cp && !ci ){
+	tp_score++;
+	totp_score++;
+      };
       if(
 	 use_CAL            &&
-	 calo2_obj->npcfit[1] > 5     &&   //no. of fit planes on Y view
-	 calo2_obj->varcfit[1] < 1000. &&  //fit variance on Y view
+//	 calo2_obj->npcfit[1] > 5     &&   //no. of fit planes on Y view
+//	 calo2_obj->varcfit[1] < 1000. &&  //fit variance on Y view
 	 cp && ci &&
 	 true){
 
 		
-	Float_t resy_p = cp->tbar[0][1] - calo2_obj->cbar[0][1]; if(resy_p < 0)resy_p= - resy_p;
-	Float_t resy_i = ci->tbar[0][1] - calo2_obj->cbar[0][1]; if(resy_i < 0)resy_i= - resy_i;
+// 	Float_t resy_p = cp->tbar[0][1] - calo2_obj->cbar[0][1]; if(resy_p < 0)resy_p= - resy_p;
+// 	Float_t resy_i = ci->tbar[0][1] - calo2_obj->cbar[0][1]; if(resy_i < 0)resy_i= - resy_i;
 		
-	if(resy_p <= resy_i) tp_score++;
-	else                 ti_score++;
+// 	if(resy_p <= resy_i) tp_score++;
+// 	else                 ti_score++;
 	
+
+	if( cp->npresh > ci->npresh){
+	  tp_score++;
+	  totp_score++;
+	};
+	if( cp->npresh < ci->npresh){
+	  ti_score++;
+	  toti_score++;
+	};
+
 	//	cout << "CALO "<<tp_score<<ti_score<<endl;
 
       };
-      // ------------------------
+      // -----------------------------------------------------------------------------------------
       // TOF check
-      // ------------------------	    
+      // -----------------------------------------------------------------------------------------
       // check the number of hit pmts along the track 
       // on S12 S21 and S32, where paddles are parallel to Y axis
-      if( use_TOF && !tof_obj ){
+      if( (use_TOF || use_S1 || use_S2 || use_S3 ) && !tof_obj ){
 	cout << "void PamLevel2::SortTracks(): howtosort= "<<how<<" but ToFLevel2 not loaded !!!";
 	return;
       };
-      if( use_TOF && op && oi ){
-		
+      //
+      if( (use_TOF || use_S1 || use_S2 || use_S3 ) && !op && oi ){
+	ti_score++;
+	toti_score++;
+      };
+      if( (use_TOF || use_S1 || use_S2 || use_S3 ) && op && !oi ){
+	tp_score++;
+	totp_score++;
+      };
+      if( (use_TOF || use_S1 || use_S2 || use_S3 ) && op && oi ){
 	//
 	Float_t sen = 0.;
 	for (Int_t ih=0; ih < op->npmtadc; ih++){
@@ -737,7 +802,7 @@
 	  if ( pl == 2 || pl == 3 || pl == 4 || pl == 5 ) sen += (oi->dedx).At(ih);
 	};
 	//
-	if (  sen >= sortthr ){
+	if (  sen >= sortthr && false){ // temporary disabled NUCLEI special algorithm since the new one should work for every particle (to be checked!)
 	  //printf(" IS A NUCLEUS! en = %f \n",sen);
 	  //
 	  // is a nucleus use a different algorithm
@@ -830,7 +895,7 @@
 
 		
 	  if(
-	     use_TOF            &&
+	     (use_TOF || use_S1 || use_S2 || use_S3)            &&
 	     (nphit_p+nphit_i) !=0 &&	
 	     true){
 		    
@@ -863,52 +928,105 @@
 	    cout << "image: npmtadc "<< oi->npmtadc << endl;
 	    cout << "image: npmttdc "<< oi->npmttdc << endl;*/
 		
-	  for (Int_t ih=0; ih < op->npmtadc; ih++){
-	    Int_t pl = tof_obj->GetPlaneIndex( (op->pmtadc).At(ih) );
-	    if(pl == 1 || pl == 2 || pl == 5)nphit_p++;
+// 	  for (Int_t ih=0; ih < op->npmtadc; ih++){
+// 	    Int_t pl = tof_obj->GetPlaneIndex( (op->pmtadc).At(ih) );
+// 	    if(pl == 1 || pl == 2 || pl == 5)nphit_p++;
+// 	  };
+		
+// 	  for (Int_t ih=0; ih < oi->npmtadc; ih++){
+// 	    Int_t pl = tof_obj->GetPlaneIndex( (oi->pmtadc).At(ih) );
+// 	    if(pl == 1 || pl == 2 || pl == 5)nphit_i++;	
+// 	  };
+	  // --- modified to count tdc signals (more efficient?)
+	  // --- and to implement check on tdcflag
+	  for (Int_t ih=0; ih < op->npmttdc; ih++){
+	    Int_t pl = tof_obj->GetPlaneIndex( (op->pmttdc).At(ih) );
+//	    if( (op->tdcflag).At(ih)==0 && (pl == 1 || pl == 2 || pl == 5) )nphit_p++;
+	    if ( (use_S1 && ( pl == 0 || pl == 1 )) || (use_S2 && ( pl == 2 || pl == 3 )) || (use_S3 && ( pl == 4 || pl == 5 )) ){
+	      if( (op->tdcflag).At(ih)==0 )nphit_p++;
+	    };
 	  };
 		
-	  for (Int_t ih=0; ih < oi->npmtadc; ih++){
-	    Int_t pl = tof_obj->GetPlaneIndex( (oi->pmtadc).At(ih) );
-	    if(pl == 1 || pl == 2 || pl == 5)nphit_i++;	
+	  for (Int_t ih=0; ih < oi->npmttdc; ih++){
+	    Int_t pl = tof_obj->GetPlaneIndex( (oi->pmttdc).At(ih) );
+//	    if( (oi->tdcflag).At(ih)==0 && (pl == 1 || pl == 2 || pl == 5) )nphit_i++;	
+	    if ( (use_S1 && ( pl == 0 || pl == 1 )) || (use_S2 && ( pl == 2 || pl == 3 )) || (use_S3 && ( pl == 4 || pl == 5 )) ){
+	      if( (oi->tdcflag).At(ih)==0 )nphit_i++;	
+	    };
 	  };
 		
 	  if(
-	     use_TOF            &&
 	     (nphit_p+nphit_i) !=0 &&	
 	     true){
 		    
-	    if( nphit_p >= nphit_i) tp_score++;
-	    else ti_score++;
+	    if ( nphit_p != nphit_i ){
+	      totp_score += nphit_p;
+	      toti_score += nphit_i;
+	    };
+	    if     ( nphit_p > nphit_i) tp_score++;
+	    else if( nphit_p < nphit_i) ti_score++;
+	    else ;//niente
 	  };
 	};
 	//	cout << "TOF "<<tp_score<<ti_score<<endl;
       };
-      if(tp_score == ti_score) use_TRK = true;
-      // ------------------------
+
+
+//      if(tp_score == ti_score) use_TRK = true;
+
+
+      // -----------------------------------------------------------------------------------------
       // tracker check
-      // ------------------------
+      // -----------------------------------------------------------------------------------------
       // chi**2 difference is not always large enough to distinguish among 
       // the real track and its image.
       // Tracker check will be applied always when calorimeter and tof information is ambiguous.
+      // *** MODIFIED ON AUGUST 2007 ***
       if(use_TRK){
-	if(      tp->chi2 > 0 && tp->chi2 < ti->chi2 ) tp_score++ ;
-	else if( ti->chi2 > 0 && ti->chi2 < tp->chi2 ) ti_score++ ;
+// 	if(      tp->chi2 > 0 && tp->chi2 < ti->chi2 ) tp_score++ ;
+// 	else if( ti->chi2 > 0 && ti->chi2 < tp->chi2 ) ti_score++ ;
+
+	  // CHECK 1 : number of points along X  
+	if ( tp->GetNX() >= ti->GetNX() ){
+	  tp_score++ ;
+	  totp_score++ ;
+	};
+	if ( tp->GetNX() <= ti->GetNX() ){
+	  ti_score++ ;
+	  toti_score++ ;
+	};
+	  // CHECK 2 : number of points along Y  
+	if ( tp->GetNY() >= ti->GetNY() ){
+	  tp_score++ ;
+	  totp_score++ ;
+	};
+	if ( tp->GetNY() <= ti->GetNY() ){
+	  ti_score++ ;
+	  toti_score++ ;
+	};
+	  // CHECK 3 : chi**2 along X  
+// 	  if(      tp->GetChi2X() > 0 && (tp->GetChi2X() < ti->GetChi2X() || ti->GetChi2X() <=0) ) tp_score++ ;
+// 	  if(      ti->GetChi2X() > 0 && (ti->GetChi2X() < tp->GetChi2X() || tp->GetChi2X() <=0) ) ti_score++ ;
+	  // CHECK 4 : chi**2 along Y  
+// 	  if(      tp->GetChi2Y() > 0 && (tp->GetChi2Y() < ti->GetChi2Y() || ti->GetChi2Y() <=0) ) tp_score++ ;
+// 	  if(      ti->GetChi2Y() > 0 && (ti->GetChi2Y() < tp->GetChi2Y() || tp->GetChi2Y() <=0) ) ti_score++ ;
+	  // CHECK 5 : total chi**2   
+// 	  if(      tp->chi2 > 0 && (tp->chi2 < ti->chi2 || ti->chi2 <=0) ) tp_score++ ;
+// 	  if(      ti->chi2 > 0 && (ti->chi2 < tp->chi2 || tp->chi2 <=0) ) ti_score++ ;
+
 	//	cout << "TRK "<<tp_score<<ti_score<<endl;
       };
 	    
-      // ------------------------
+
+
+      // *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
       // the winner is....
-      // ------------------------	    
+      // *-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*-*
       if      (tp_score > ti_score) {
-	// 		ts = tp;//the track sorted by the tracker!!
-	// 		cs = cp;
-	// 		os = op;
-	//	cout << "It's primary!" << endl;
+	 
 
       }else if (tp_score < ti_score) {
 
-	//	cout << "It's image!" << endl;
 
 	ts = ti;//its image!!
 	cs = ci;
@@ -924,14 +1042,15 @@
 
 		
       }else {
-	// 		ts = tp;
-	// 		cs = cp;
-	// 		os = op;
-	cout << "Warning - track image ambiguity not solved" << endl;
-	//				cout << ts->GetNtot() << " "<< ts->chi2 << " " << npcfit[1] << " "<< nphit_p << endl;
+
+//	cout << "Warning - track image ambiguity not solved" << endl;
+
       };
 	    
     }else{
+      totp_score = 1;
+      toti_score = 0;
+      
       // 	    ts = tp;
       // 	    cs = cp;
       // 	    os = op;
@@ -945,8 +1064,12 @@
     //	cout<<"o "<<tp<<endl;
     //	cout<<"o "<<cp<<endl;
     //	cout<<"o "<<op<<endl;
+
     new(ttsorted[i]) PamTrack(tp,cp,op);
     new(ttimage[i])  PamTrack(ti,ci,oi);
+
+    ((PamTrack*)(ttsorted[i]))->SetPScore(totp_score);
+    ((PamTrack*)(ttimage[i]))->SetIScore(toti_score);
   };
 
   if( tsorted->GetEntries() != trk2_obj->GetNTracks() ){
@@ -1863,11 +1986,15 @@
       //
       // the absolute time is necessary to relate the event with the run
       //
-      if( !GetOrbitalInfo() ){
+      if( !GetOrbitalInfo() && !ISGP){
 	  cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing OrbitalInfo "<<endl;
 	  return(false);
       }
 
+      ULong64_t abstime = 0;
+      if( GetOrbitalInfo() )abstime=GetOrbitalInfo()->absTime;
+
+
       //
       // the first time the routine is called, set run search from the beginning
       //
@@ -1877,11 +2004,19 @@
  	  runfirstentry = 0LL;
  	  runlastentry += (Long64_t)(this->GetRunInfo()->NEVENTS);
  	  if ( (Long64_t)(this->GetRunInfo()->NEVENTS) > 0LL ) runlastentry -= 1LL;
+	  
+	  if( ISGP && run->GetEntries()!=1 ){
+	      cout << "** WARNING ** simulated files are assumed to have 1 single run, not "<< run->GetEntries() << endl;
+	      cout << "** WARNING ** run will not be updated"<<endl;
+	  }
+
       };      
       //
-       if ( irun == run->GetEntries()-1LL && 
-	   !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && 
-	     GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) 
+      if(ISGP)abstime = GetRunInfo()->RUNHEADER_TIME; // BARBATRUCCO
+      //
+      if ( irun == run->GetEntries()-1LL && 
+	   !(abstime >= GetRunInfo()->RUNHEADER_TIME && 
+	     abstime <= GetRunInfo()->RUNTRAILER_TIME) 
 	    ){
 	 irun = -1LL;
 	 runfirstentry = 0LL;
@@ -1892,7 +2027,7 @@
       //
       bool fromfirst = true;
       //
-      while ( !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) && irun < run->GetEntries()-1LL ){
+      while ( !(abstime >= GetRunInfo()->RUNHEADER_TIME && abstime <= GetRunInfo()->RUNTRAILER_TIME) && irun < run->GetEntries()-1LL ){
 //      while ( iev > (runfirstentry+(ULong64_t)(this->GetRunInfo()->NEVENTS-1)) && irun < run->GetEntries() ){
 	  irun++;
 	  run->GetEntry(irun);
@@ -1902,12 +2037,12 @@
 // 	  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(" abstime %u trailertime %u \n",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)){
+	  if ( irun == (Long64_t)(run->GetEntries()-1LL) && fromfirst && !(abstime >= GetRunInfo()->RUNHEADER_TIME && abstime <= GetRunInfo()->RUNTRAILER_TIME)){
 	      printf(" resetting irun  (it should NOT happen!!!)\n");
 	      fromfirst = false;
 	      irun = 0;
@@ -1920,10 +2055,10 @@
       };
       //
       if ( 
-	   !(GetOrbitalInfo()->absTime >= GetRunInfo()->RUNHEADER_TIME && 
-	     GetOrbitalInfo()->absTime <= GetRunInfo()->RUNTRAILER_TIME) 
+	   !(abstime >= GetRunInfo()->RUNHEADER_TIME && 
+	     abstime <= GetRunInfo()->RUNTRAILER_TIME) 
 	  ) {
-	  printf(" Something very wrong here: cannot find RUN containing absolute time %u \n",GetOrbitalInfo()->absTime);
+	printf(" Something very wrong here: cannot find RUN containing absolute time %llu \n",abstime);
 	  return false;
       }
       //
@@ -1975,9 +2110,29 @@
     if(SELLI==0){
 
 	// ---------------------------------------------------------------
+	// increment dead and live-time counters
+	// ---------------------------------------------------------------
+	if( GetTrigLevel2() ){
+	    totdltime[0]+=GetTrigLevel2()->dltime[0];
+	    totdltime[1]+=GetTrigLevel2()->dltime[1];
+	}
+	totdltime[2]++;
+
+//	cout << setw(10)<<totdltime[0]<<setw(10)<<totdltime[1]<<setw(10)<<totdltime[2]<<endl;
+
+	// ---------------------------------------------------------------
+	// retrieve OBT and absolute time of the event
+	// ---------------------------------------------------------------
+	ULong64_t abstime = 0;
+	ULong64_t obt     = 0;
+	if( GetOrbitalInfo() ){
+	    abstime = GetOrbitalInfo()->absTime;
+	    obt     = GetOrbitalInfo()->OBT;
+	}
+	// ---------------------------------------------------------------
 	// the absolute time is necessary to relate the event with the run
 	// ---------------------------------------------------------------
-	if( !GetOrbitalInfo() ){
+	if( !GetOrbitalInfo() && !ISGP ){
 	    cout << "Bool_t PamLevel2::UpdateRunInfo(Long64_t iev) -- ERROR -- missing OrbitalInfo "<<endl;
 	    return(false);
 	}
@@ -1987,18 +2142,83 @@
 	// -----------------------------------------------------------------------
 	if ( irun < 0 ){
 	    irun = 0LL;
+	    irunentry = 0;
+	    prevshift = 0;
 	    run_tree->GetEntry(irun);
+
+	    if( ISGP && run_tree->GetEntries()!=1 ){
+		cout << "** WARNING ** simulated files are assumed to have 1 single run, not "<< run_tree->GetEntries() << endl;
+		cout << "** WARNING ** run will not be updated"<<endl;
+	    }
 	};      
+
+	// -----------------------------------------------------------------------
+	// if it is simulation, assigh abstime by hand (temporaneo!!!)
+	// -----------------------------------------------------------------------
+	if(ISGP){
+	    abstime = GetRunInfo()->RUNHEADER_TIME; // BARBATRUCCO
+	    obt     = GetRunInfo()->RUNHEADER_OBT; // BARBATRUCCO
+	}
 	//
 	bool fromfirst = true; // first loop over runs
+
+//	Bool_t hasfrag = false;
+//	if( GetRunInfo()->ID_RUN_FRAG!=0 && GetRunInfo()->ID_RUN_FRAG != GetRunInfo()->ID)hasfrag=true;
+//	ULong64_t fragid = GetRunInfo()->ID_RUN_FRAG;
+
 	// ------------------------------------------------------
 	// 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() ){
+	while ( 
+	    (
+	        (
+		    !(abstime >= GetRunInfo()->RUNHEADER_TIME &&    // check on absolute time (s)
+		      abstime <= GetRunInfo()->RUNTRAILER_TIME) && 
+		    !(obt >= GetRunInfo()->RUNHEADER_OBT &&         // additional check on OBT (ms)
+		      obt <= GetRunInfo()->RUNTRAILER_OBT)
+		    ) 
+  		|| GetRunInfo()->NEVENTS==0 
+		|| !(irunentry < GetRunInfo()->NEVENTS-1-prevshift)
+		)
+		&& irun < run_tree->GetEntries() ){
+
+
+
+
+	    // -----------------------------------------
+	    // store dead and live-time of previous run
+	    // -----------------------------------------
+	    if(fromfirst){
+		if(oldrun==irun){
+		    /// decrement counters
+		    if( GetTrigLevel2()){
+			totdltime[0]-=GetTrigLevel2()->dltime[0];//live-time
+			totdltime[1]-=GetTrigLevel2()->dltime[1];//dead-time
+		    }
+		    totdltime[2]--;                              //event counter
+		    cout << endl;
+		    cout << "n.events     : "<<totdltime[2]<<endl;
+		    cout << "RUN LIVE-TIME: "<<totdltime[0]*0.16<<" ms"<<endl;
+		    cout << "RUN DEAD-TIME: "<<totdltime[1]*0.01<<" ms"<<endl;	    
+		}else{
+		    totdltime[0]=0;//live-time
+		    totdltime[1]=0;//dead-time
+		    totdltime[2]=0;                             //event counter
+		    cout << " *** JUMP RUN *** irun "<<irun<<endl; 
+		}
+		/// add an entry
+		if(run_tree_clone)
+		    if(run_tree_clone->GetBranch("DeadLiveTime")->GetEntries() < run_tree->GetEntries())
+			run_tree_clone->GetBranch("DeadLiveTime")->Fill();
+		/// reset counters
+		if( GetTrigLevel2() ){
+		    totdltime[0]=GetTrigLevel2()->dltime[0];//live-time
+		    totdltime[1]=0;                         //dead-time
+		}
+		totdltime[2]=1;                             //event counter
+	    }
+
+
 	    irun++;
 	    // ------------------------------------
 	    // if the end of run tree is reached...
@@ -2024,13 +2244,20 @@
 	    // 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);
+	    if(irun>0)runfirstentry += (GetRunInfo()->NEVENTS)-prevshift;
+	    irunentry = 0;
+	    prevshift = 0;	    
 	    run_tree->GetEntry(irun);	   
-	    if(GetRunInfo()->RUNHEADER_OBT>=GetRunInfo()->RUNTRAILER_OBT ){
+	    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(hasfrag &&  fragid != GetRunInfo()->ID){
+//  		cout << "... where is the next fragment ??"<<endl;
+// 	    }
 	};
+
+
 	// --------------------------------------
 	// if there was no need to update the run
 	// ---> exit with FALSE
@@ -2039,10 +2266,75 @@
 
 	// --------------------------------------
 	// ... otherwise 
+	// --------------------------------------
+
+
+
+// 	// -----------------------------------------
+// 	// store dead and live-time of previous run
+// 	// -----------------------------------------
+// 	// --------------------------------------------------------------
+// 	// if the run is empty, fill the dead-live time branch with zeros
+// 	// --------------------------------------------------------------
+// 	/// if some runs have been jumped, fill with zeros
+// 	if(irun-oldrun>1){
+// 	    ULong64_t  temp[3];
+// 	    temp[0]=totdltime[0];
+// 	    temp[1]=totdltime[1];
+// 	    temp[2]=totdltime[2];
+// 	    for(int i=oldrun+1; i<irun; irun++){
+// 		totdltime[0]=0;
+// 		totdltime[1]=0;
+// 		totdltime[2]=0;
+// 		cout << " ** JUMPED RUN **"<<endl;
+// 		if(run_tree_clone)
+// 		    if(run_tree_clone->GetBranch("DeadLiveTime")->GetEntries() < run_tree->GetEntries())
+// 			run_tree_clone->GetBranch("DeadLiveTime")->Fill();
+// 	    }
+// 	    totdltime[0]=temp[0];
+// 	    totdltime[1]=temp[1];
+// 	    totdltime[2]=temp[2];
+// 	}
+// 	/// decrement counters
+// 	if( GetTrigLevel2() ){
+// 	    totdltime[0]-=GetTrigLevel2()->dltime[0];//live-time
+// 	    totdltime[1]-=GetTrigLevel2()->dltime[1];//dead-time
+// 	}
+// 	totdltime[2]--;                              //event counter
+// 	/// add an entry
+// 	if(irun>0 ){ 
+// 	    cout << endl;
+// 	    cout << "n.events     : "<<totdltime[2]<<endl;
+// 	    cout << "RUN LIVE-TIME: "<<totdltime[0]*0.16<<" ms"<<endl;
+// 	    cout << "RUN DEAD-TIME: "<<totdltime[1]*0.01<<" ms"<<endl;	    
+// 	    if(run_tree_clone)
+// 		if(run_tree_clone->GetBranch("DeadLiveTime")->GetEntries() < run_tree->GetEntries())
+// 		    run_tree_clone->GetBranch("DeadLiveTime")->Fill();
+// 	}
+// 	/// reset counters
+// 	if( GetTrigLevel2() ){
+// 	    totdltime[0]=GetTrigLevel2()->dltime[0];//live-time
+// 	    totdltime[1]=0;                         //dead-time
+// 	}
+// 	totdltime[2]=1;                             //event counter
+       	
+
+	// --------------------------------------
 	// ---> exit with TRUE
 	// --------------------------------------
 	cout << endl << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
-	prevshift = 0;
+	// ----------------------------------------------------
+	// then check if the run has a fragment 
+	// in this case we have to switch to the next fragment
+	// when the end of the first fragment is reached
+	// ----------------------------------------------------
+	if( 
+	    GetRunInfo()->ID_RUN_FRAG != 0 && 
+//	    GetRunInfo()->ID_RUN_FRAG != GetRunInfo()->ID && 
+	    true ){
+	    cout << "* fragment *"<<endl;		
+	} 
+
 	return(true);    
     };
     // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-
@@ -2691,6 +2983,14 @@
  */
 void PamLevel2::CreateCloneTrees(TFile *ofile){
 
+
+//  if the pointer is null, create a default file
+
+    if(!ofile){
+	cout << "void PamLevel2::CreateCloneTrees(TFile*) -- WARNING -- Creating file: clone-tree.root "<<endl;
+	ofile = new TFile("clone-tree.root","recreate");
+    }
+
     ofile->cd();
 
     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
@@ -2714,6 +3014,12 @@
     }
     cout << "----------------------------------------------------"<<endl;
 
+    // ------------------------------------
+    // add branch with dead and live times
+    // ------------------------------------
+    run_tree_clone->Branch("DeadLiveTime",totdltime,"dltime[3]/l");
+    cout << "Run          : branch DeadLiveTime"<<endl;
+
 
     sel_tree_clone = new TTree("SelectionList","List of selected events ");
     sel_tree_clone->Branch("RunEntry",&irun,"runentry/L");
@@ -2840,7 +3146,9 @@
 void PamLevel2::WriteCloneTrees(){
     cout << "+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+--+" <<endl;
     cout << "Write clones of PAMELA trees "<<endl;
-    cout << run_tree_clone->GetName()<<endl;    
+    cout << run_tree_clone->GetName()<<endl;   
+    if(run_tree_clone->GetBranch("DeadLiveTime")->GetEntries() < run_tree->GetEntries())
+	run_tree_clone->GetBranch("DeadLiveTime")->Fill();
     run_tree_clone->Write();
     cout << sel_tree_clone->GetName()<<endl;    
     sel_tree_clone->Write();
@@ -2860,6 +3168,9 @@
 //Int_t PamLevel2::GetEntry(Int_t iee){
 Int_t PamLevel2::GetEntry(Long64_t iee){
     
+//     cout << "-------------------------------------"<<endl;
+//     cout << "Int_t PamLevel2::GetEntry("<<iee<<")"<<endl;
+
     if(!pam_tree){
 	cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- level2 trees not loaded"<<endl;
 	return 0;
@@ -2905,18 +3216,40 @@
    
 //    cout << "PamLevel2::GetEntry("<<iee<<") "<<irun<<" "<<runfirstentry<<" "<<irunentry<<endl;
 
-//    cout << " irunentry "<<irunentry << endl;
+//     cout << "irunentry     "<<irunentry << endl;
+//     cout << "runfirstentry "<<runfirstentry << endl;
+//     cout << "nevents       "<<GetRunInfo()->NEVENTS<< endl;
+
+//     if( TRK0 || CAL0 || TOF0 ){
+// 	if( !GetYodaEntry( ) ){
+// 	    cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading level0 tree"<<endl;
+// 	    return 0;
+// 	}
+//     }
+
 
-    if( TRK0 || CAL0 || TOF0 ){
-	if( !GetYodaEntry( ) ){
-	    cout << " Int_t PamLevel2::GetEntry(Int_t) -- ERROR -- error reading level0 tree"<<endl;
-	    return 0;
-	}
-    }
     return 1;
 
 }
 
+TrkLevel0    *PamLevel2::GetTrkLevel0(){
+    if( !TRK0 )return NULL;
+    if( !GetYodaEntry( ) ){
+	cout << " Int_t PamLevel2::GetTrkLevel0() -- ERROR -- error reading level0 tree"<<endl;
+	return 0;
+    }
+    return trk0_obj;
+};
+CaloLevel0    *PamLevel2::GetCaloLevel0(){
+    if( !CAL0 )return NULL;
+    if( !GetYodaEntry( ) ){
+	cout << " Int_t PamLevel2::GetCaloLevel0() -- ERROR -- error reading level0 tree"<<endl;
+	return 0;
+    }
+    return calo0_obj;
+};
+
+
 /**
  * Method to retrieve the level0 tree (YODA tree) that contains the current event.
  * Given the run ID (...), if needed it query the DB and load the proper file.
@@ -2936,8 +3269,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
@@ -2994,7 +3327,7 @@
 	    };
 	    l0_tree->SetBranchAddress("Tracker" ,trk0_obj->GetPointerToTrackerEvent());
 	}
-	//---------------------------------------------------
+	//--------------------------------------------------
 	// CALORIMETER:
 	if(CAL0){
 	    if(!calo0_obj){
@@ -3057,14 +3390,21 @@
 
 //     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 << " time "<< abstime << endl;
 //     cout << " trk_calib_used "<<run_obj->TRK_CALIB_USED<< endl;
     
-    if( !GetOrbitalInfo() ){
+    ULong64_t obt     = 0;
+    ULong64_t pktn    = 0;
+    if( GetOrbitalInfo() ){ 
+	obt     = GetOrbitalInfo()->OBT;
+	pktn    = GetOrbitalInfo()->pkt_num;
+    }
+
+    if( !GetOrbitalInfo() && !ISGP){
 	cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- missing OrbitalInfo "<<endl;
 	return 0;
     }
-    if( GetOrbitalInfo()->OBT==0 && GetOrbitalInfo()->pkt_num==0 ){
+    if( obt==0 && pktn==0 && !ISGP ){
 	cout << "Int_t PamLevel2::GetYodaEntry() -- ERROR -- level2 event corrupted ?? "<<endl;	
 	return 0;
     }
@@ -3083,10 +3423,10 @@
     Int_t answer = 0;
     Int_t shift =0;
     //    printf(" siamo qui %i %i \n",shift,prevshift);
-    Int_t maxshift = 100;
+    Int_t maxshift = 10;
     do{
 	if(shift>0){	 
-	    cout << " PKTNUM  L2 --- "<< GetOrbitalInfo()->pkt_num << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetCounter()<<endl;
+	    cout << " PKTNUM  L2 --- "<< pktn << " --- 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;
 	}
@@ -3096,12 +3436,18 @@
 	    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(ISGP){
+	    obt = (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()); //BARBATRUCCO
+	    pktn = (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter()); //BARBATRUCCO
+	}
+
+//	cout << "PKTNUM "<<shift<<" ==  L2 --- "<< pktn << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetCounter()<<endl;
+//	cout << " L2 --- "<< 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 << " obt "<< obt << endl;
 // 	cout << " GetEventHeader()->GetPscuHeader()->GetOrbitalTime() "<< GetEventHeader()->GetPscuHeader()->GetOrbitalTime() << endl;
-// 	cout << " GetOrbitalInfo()->pkt_num "<< GetOrbitalInfo()->pkt_num << endl;
+// 	cout << " pktn "<< pktn << endl;
 // 	cout << " GetEventHeader()->GetPscuHeader()->GetCounter() "<< GetEventHeader()->GetPscuHeader()->GetCounter() << endl;
 //	printf(" IDRUN %u \n",GetRunInfo()->ID);
 //
@@ -3110,9 +3456,11 @@
 	  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);
+    }while( ( obt != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetOrbitalTime()) || 
+	      pktn != (UInt_t)(GetEventHeader()->GetPscuHeader()->GetCounter())       ) 
+	    && (quellagiusta+(Long64_t)shift) < GetYodaTree()->GetEntries() && shift < maxshift);
 
-    if ( (quellagiusta+(Long64_t)shift) == GetYodaTree()->GetEntries() || shift == maxshift ) {
+    if ( (quellagiusta+(Long64_t)shift+(Long64_t)prevshift) > GetYodaTree()->GetEntries() || shift == maxshift ) {
 	cout << " Big trouble here, no such event in Level0 data! " <<endl;
 	return 0;
     }
@@ -3123,5 +3471,53 @@
     return answer;
     
 }
+/**
+ * \Brief Set DB connection
+ */
+Bool_t PamLevel2::SetDBConnection(){
+
+    cout<<"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; 
+    cout<<"Connecting to DB"<<endl;
+    cout<<"HOST "<<host<<endl;
+    cout<<"USER "<<user<<endl;
+    cout<<"PSW  "<<psw<<endl;
+    dbc = TSQLServer::Connect(host.Data(),user.Data(),psw.Data());
+    if( !dbc )return false;
+    if( !dbc->IsConnected() )return false;    
+    cout<<"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; 
+    return true;
+
+}
+
+/**
+ * \Brief Add a friend to the pamela chain.
+ * @param cname name of the chain to be added
+ */
+
+TChain* PamLevel2::AddFriend(TString cname){
+
+    if(!GetPamTree()){
+	cout << " TChain* PamLevel2::AddFriend(TString cname) --- a pamela tree must be created first"<<endl;
+	return NULL;
+    }
 
 
+    TChain *c = new TChain( cname.Data() );
+
+    TIter next( GetPamTree()->GetListOfFiles() );
+    Int_t nf = 0;
+    TChainElement* element = 0;    
+    while ((element = (TChainElement*) next())) {	
+	c->Add(element->GetTitle());
+	nf++;
+    }
+
+    GetPamTree()->AddFriend(cname.Data());
+
+    cout << "external chain created and added to pamela friends :"<<cname<<endl;
+    cout << "n.files "<<nf<<endl;
+    
+
+    return c;    
+
+}