--- PamelaLevel2/src/PamLevel2.cpp	2007/09/12 09:25:22	1.46
+++ PamelaLevel2/src/PamLevel2.cpp	2007/10/29 09:13:06	1.51
@@ -145,6 +145,7 @@
     dbc     = 0;
 
     prevshift = 0;
+    maxshift = 10; //EMILIANO
     
     run_tree = NULL;
     run_tree_clone = NULL;
@@ -962,10 +963,12 @@
 	    if ( nphit_p != nphit_i ){
 	      totp_score += nphit_p;
 	      toti_score += nphit_i;
+	      tp_score+=nphit_p;
+	      ti_score+=nphit_i;
 	    };
-	    if     ( nphit_p > nphit_i) tp_score++;
-	    else if( nphit_p < nphit_i) ti_score++;
-	    else ;//niente
+	    //	    if     ( nphit_p > nphit_i) tp_score+=nphit_p;
+	    //	    else if( nphit_p < nphit_i) ti_score+=nphit_i;
+	    //	    else ;//niente
 	  };
 	};
 	//	cout << "TOF "<<tp_score<<ti_score<<endl;
@@ -1031,6 +1034,7 @@
 	ts = ti;//its image!!
 	cs = ci;
 	os = oi;
+	Int_t totis = toti_score;
 
 	ti = tp;//its image!!
 	ci = cp;
@@ -1040,6 +1044,9 @@
 	cp = cs;
 	op = os;
 
+	toti_score = totp_score;
+	totp_score = totis;
+
 		
       }else {
 
@@ -1069,6 +1076,8 @@
     new(ttimage[i])  PamTrack(ti,ci,oi);
 
     ((PamTrack*)(ttsorted[i]))->SetPScore(totp_score);
+    ((PamTrack*)(ttsorted[i]))->SetIScore(toti_score);
+    ((PamTrack*)(ttimage[i]))->SetPScore(totp_score);
     ((PamTrack*)(ttimage[i]))->SetIScore(toti_score);
   };
 
@@ -1967,7 +1976,7 @@
   //
   // check if we have already called once GetEntry, if not call it
   //
-    cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, Long64_t iev) --- NON FUNZIONA BENISSIMO.... "<<endl;
+    cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, Long64_t iev) --- ATTENZIONE --- NON E` MANTENUTA!!!!!!!.... "<<endl;
     if(!run){
 	  cout << "Bool_t PamLevel2::UpdateRunInfo(TChain *run, ULong64_t iev) -- ERROR -- missing RunInfo tree "<<endl;
 	  return(false);	
@@ -2153,7 +2162,7 @@
 	};      
 
 	// -----------------------------------------------------------------------
-	// if it is simulation, assigh abstime by hand (temporaneo!!!)
+	// if it is simulation, assign abstime by hand (temporaneo!!!)
 	// -----------------------------------------------------------------------
 	if(ISGP){
 	    abstime = GetRunInfo()->RUNHEADER_TIME; // BARBATRUCCO
@@ -2178,12 +2187,15 @@
 		      obt <= GetRunInfo()->RUNTRAILER_OBT)
 		    ) 
   		|| GetRunInfo()->NEVENTS==0 
-		|| !(irunentry < GetRunInfo()->NEVENTS-1-prevshift)
+//		|| !(irunentry < GetRunInfo()->NEVENTS-1-prevshift) // ERRORE!!! fa saltare i run con 1 evento
+		|| !(irunentry <= GetRunInfo()->NEVENTS-1-prevshift)
 		)
 		&& irun < run_tree->GetEntries() ){
 
-
-
+	    // - - - - - - - - - - - - -
+	    // irunentry = position of current entry, relative to the run
+            // prevshift = shift needed to synchronize l0 and l2 data (nested events)
+	    // - - - - - - - - - - - - -
 
 	    // -----------------------------------------
 	    // store dead and live-time of previous run
@@ -3284,7 +3296,7 @@
 	//===================================
 	if(!dbc || (dbc && !dbc->IsConnected())){
 	    cout<<"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; 
-	    cout<<"Connecting to DB"<<endl;
+	    cout<<"Re-connecting to DB"<<endl;
 	    cout<<"HOST "<<host<<endl;
 	    cout<<"USER "<<user<<endl;
 	    cout<<"PSW  "<<psw<<endl;
@@ -3343,11 +3355,14 @@
 	    cout << "PamLevel2::GetYodaTree() --- level0 TOF not implemented "<<endl;
 	}
 
+	dbc->Close();
+
+
     };
 
-    if(!dbc || (dbc && !dbc->IsConnected())){
-	cout << " TTree* PamLevel2::GetYodaTree( ) -- no DB connected... hai fatto qualche cazzata "<<endl;
-    }
+//     if(!dbc || (dbc && !dbc->IsConnected())){
+// 	cout << " TTree* PamLevel2::GetYodaTree( ) -- no DB connected... hai fatto qualche cazzata "<<endl;
+//     }
 
     if ( TRK0 ){
 	TrkParams::Load(6);
@@ -3361,8 +3376,8 @@
 	};
     }
 
+
 //    cout << l0_tree << endl;
-    
     return l0_tree;
 
 }
@@ -3423,7 +3438,7 @@
     Int_t answer = 0;
     Int_t shift =0;
     //    printf(" siamo qui %i %i \n",shift,prevshift);
-    Int_t maxshift = 10;
+    //    Int_t maxshift = 50; // EMILIANO
     do{
 	if(shift>0){	 
 	    cout << " PKTNUM  L2 --- "<< pktn << " --- L0 --- "<< GetEventHeader()->GetPscuHeader()->GetCounter()<<endl;