--- PamelaLevel2/src/PamLevel2.cpp	2008/09/30 07:45:24	1.63
+++ PamelaLevel2/src/PamLevel2.cpp	2008/11/06 10:45:36	1.65
@@ -284,6 +284,7 @@
     trk_track  = 0;
     calo_track = 0;
     tof_track  = 0;
+    orb_track  = 0;
     candeleteobj = 0;
     pscore = 0;
     iscore = 0;
@@ -295,17 +296,19 @@
 /**
  * Constructor 
  */
-PamTrack::PamTrack(TrkTrack* t, CaloTrkVar* c, ToFTrkVar* o){ 
+PamTrack::PamTrack(TrkTrack* t, CaloTrkVar* c, ToFTrkVar* o, OrbitalInfoTrkVar *r){ 
 
     trk_track  = 0;
     calo_track = 0;
     tof_track  = 0;
+    orb_track  = 0;
 //     if(t)trk_track  = new TrkTrack(*t);
 //     if(c)calo_track = new CaloTrkVar(*c);
 //     if(o)tof_track  = new ToFTrkVar(*o);
     if(t)trk_track  = t;
     if(c)calo_track = c;
     if(o)tof_track  = o;
+    if(r)orb_track  = r;
     candeleteobj = 0;
 
 };
@@ -314,13 +317,16 @@
     TrkTrack   *t = track.trk_track;
     CaloTrkVar *c = track.calo_track;
     ToFTrkVar  *o = track.tof_track;
+    OrbitalInfoTrkVar  *r = track.orb_track;
 
     trk_track  = 0;
     calo_track = 0;
     tof_track  = 0;
+    orb_track  = 0;
     if(t)trk_track  = new TrkTrack(*t);
     if(c)calo_track = new CaloTrkVar(*c);
     if(o)tof_track  = new ToFTrkVar(*o);
+    if(r)orb_track  = new OrbitalInfoTrkVar(*r);
     candeleteobj = 1;
     
 }
@@ -331,10 +337,12 @@
 	if(trk_track)  trk_track->TrkTrack::Clear();
 	if(calo_track) calo_track->CaloTrkVar::Clear();//???
 	if(tof_track)  tof_track->ToFTrkVar::Clear();//???
+	if(orb_track)  orb_track->OrbitalInfoTrkVar::Clear();//???
     }else{
 	trk_track  = 0;
 	calo_track = 0;
 	tof_track  = 0;	
+	orb_track  = 0;	
     }
     pscore = 0;
     iscore = 0;
@@ -355,6 +363,10 @@
 	    tof_track->ToFTrkVar::Clear();//???
 	    delete tof_track;
 	}
+	if(orb_track){
+  	    orb_track->OrbitalInfoTrkVar::Clear();//???
+	    delete orb_track;
+	}
     }else{
 	Clear();
     }
@@ -710,7 +722,7 @@
 
 Bool_t PamLevel2::IsGood(){
     Bool_t goodev=true;
-    //  if(trk2_obj && trk2_obj->UnpackError() != 0 ) goodev = false; 
+    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; 
@@ -744,7 +756,10 @@
 	return &trk2_obj;
     };
     if(!objname.CompareTo("TrkHough"))   {
-	if(!trkh_obj)  trkh_obj  = new TrkHough();
+	if(!trkh_obj)  {
+	    trkh_obj  = new TrkHough();
+	    trkh_obj->Set();
+	}
 	return &trkh_obj;
     };
     if(!objname.CompareTo("CaloLevel1")) {
@@ -866,7 +881,40 @@
 //
 //--------------------------------------
 /**
- * Give the pamela track associated to a tracker track, retrieving related calorimeter and tof track information. 
+ * Retrieves the OrbitalInfo track matching the seqno-th tracker stored track. 
+ * (If seqno = -1 retrieves the tracker-independent tof related track)
+ */
+OrbitalInfoTrkVar *PamLevel2::GetOrbitalInfoStoredTrack(int seqno){
+	 
+    if( !orb_obj )return 0;
+
+    if( orb_obj->OrbitalInfo::ntrk()==0 ){
+	cout << "PamLevel2::GetOrbitalInfoStoredTrack(int) : requested tracker SeqNo "<< seqno <<" but no OrbitalInfo tracks are stored"<<endl;
+	return NULL;
+    };
+     
+    OrbitalInfoTrkVar *c = 0;
+    Int_t it_tof=0;
+     
+    do{ 
+        c = orb_obj->OrbitalInfo::GetOrbitalInfoTrkVar(it_tof);
+	it_tof++; 
+    } while( c && seqno != c->trkseqno && it_tof < orb_obj->OrbitalInfo::ntrk());	
+     
+    if(!c || seqno != c->trkseqno){
+	c = 0;
+	if(seqno!=-1)cout << "PamLevel2::GetOrbitalInfoStoredTrack(int) : requested tracker SeqNo "<< seqno <<" does not match OrbitalInfo stored tracks"<<endl;
+    };
+    return c;
+     
+};
+
+//--------------------------------------
+//
+//
+//--------------------------------------
+/**
+ * Give the pamela track associated to a tracker track, retrieving related calorimeter, orbitalinfo and tof track information. 
  */
 PamTrack* PamLevel2::GetPamTrackAlong(TrkTrack* t){
      
@@ -875,12 +923,14 @@
 
     CaloTrkVar *c = 0;
     ToFTrkVar  *o = 0;
+    OrbitalInfoTrkVar  *r = 0;
      
     if(CAL2) c = GetCaloStoredTrack(t->GetSeqNo());
     if(TOF) o = GetToFStoredTrack(t->GetSeqNo());
+    if(ORB) r = GetOrbitalInfoStoredTrack(t->GetSeqNo());
      
 //    if(t && c && o)track = new PamTrack(t,c,o);
-    PamTrack *track = new PamTrack(t,c,o);
+    PamTrack *track = new PamTrack(t,c,o,r);
      
     return track;
  
@@ -898,7 +948,7 @@
 PamTrack* PamLevel2::GetStoredTrack(Int_t itrk){
     
     cout <<"PamLevel2::GetStoredTrack(Int_t itrk) **to-be-updated** "<<endl;
-    cout <<"for the moment, better use separately the methods: TrkLevel2::GetStoredTrack(seqno) CaloLevel2::GetCaloTrkVar(Int_t notrack) ToFLevel2::GetToFTrkVar(Int_t notrack)"<<endl;
+    cout <<"for the moment, better use separately the methods: TrkLevel2::GetStoredTrack(seqno) CaloLevel2::GetCaloTrkVar(Int_t notrack) ToFLevel2::GetToFTrkVar(Int_t notrack) OrbitalInfo::GetOrbitalInfoTrkVar(Int_t notrack)"<<endl;
     cout <<"(if you use it, remember to delete the PamTrack object)"<<endl;
     PamTrack *track = 0;
     
@@ -1010,15 +1060,18 @@
 	TrkTrack   *ts = 0;
 	CaloTrkVar *cs = 0;
 	ToFTrkVar  *os = 0;
+	OrbitalInfoTrkVar  *rs = 0;
 	
 	// get tracker tracks
 	TrkTrack   *tp = trk2_obj->TrkLevel2::GetTrack(i); //tracker
 	CaloTrkVar *cp = GetCaloStoredTrack(tp->GetSeqNo());
 	ToFTrkVar  *op = GetToFStoredTrack(tp->GetSeqNo());
+	OrbitalInfoTrkVar  *rp = GetOrbitalInfoStoredTrack(tp->GetSeqNo());
 
 	TrkTrack   *ti = 0; //tracker (image)
 	CaloTrkVar *ci = 0;
 	ToFTrkVar  *oi = 0;
+	OrbitalInfoTrkVar  *ri = 0;
 	//	cout << "trk track n. "<<i << " "<<hex<< tp <<dec<< endl;
 	// if track has an image, check image selection
 
@@ -1032,6 +1085,7 @@
 	    ti = trk2_obj->TrkLevel2::GetTrackImage(i);              //tracker (image)
 	    ci = GetCaloStoredTrack(ti->GetSeqNo());
 	    oi = GetToFStoredTrack(ti->GetSeqNo());
+	    ri = GetOrbitalInfoStoredTrack(ti->GetSeqNo());
 	    
 	    //	    cout << "its image "<<i << " "<<hex<< ti <<dec<< endl;
 
@@ -1373,15 +1427,18 @@
 		ts = ti;//its image!!
 		cs = ci;
 		os = oi;
+		rs = ri;
 		Int_t totis = toti_score;
 
 		ti = tp;//its image!!
 		ci = cp;
 		oi = op;
+		ri = rp;
 
 		tp = ts;//its image!!
 		cp = cs;
 		op = os;
+		rp = rs;
 
 		toti_score = totp_score;
 		totp_score = totis;
@@ -1411,8 +1468,8 @@
 	//	cout<<"o "<<cp<<endl;
 	//	cout<<"o "<<op<<endl;
 
-	new(ttsorted[i]) PamTrack(tp,cp,op);
-	new(ttimage[i])  PamTrack(ti,ci,oi);
+	new(ttsorted[i]) PamTrack(tp,cp,op,rp);
+	new(ttimage[i])  PamTrack(ti,ci,oi,ri);
 
 	((PamTrack*)(ttsorted[i]))->SetPScore(totp_score);
 	((PamTrack*)(ttsorted[i]))->SetIScore(toti_score);
@@ -2683,7 +2740,15 @@
 	// --------------------------------------
 	// ---> exit with TRUE
 	// --------------------------------------
-	cout << endl << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+	if(DBG)cout << endl << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" irun "<<irun<<endl;
+	// ----------------------------------------------------
+	// update the tracker parameters 
+	// (non ho trovato nessun altro modo sicuro di farlo...)
+	// ----------------------------------------------------
+	if(!dbc || (dbc && !dbc->IsConnected()) )SetDBConnection();
+	TrkParams::Set(GetRunInfo() ,dbc);
+	if(dbc)dbc->Close();
+
 	// ----------------------------------------------------
 	// then check if the run has a fragment 
 	// in this case we have to switch to the next fragment
@@ -2692,6 +2757,7 @@
 	if( 
 	    GetRunInfo()->ID_RUN_FRAG != 0 && 
 //	    GetRunInfo()->ID_RUN_FRAG != GetRunInfo()->ID && 
+	    DBG &&
 	    true ){
 	    cout << "* fragment *"<<endl;		
 	} 
@@ -2737,8 +2803,6 @@
 		    cout << " obt "<<obt;
 		    cout <<" >> "<<GetRunInfo()->RUNHEADER_OBT<<" "<<GetRunInfo()->RUNTRAILER_OBT;
 		    cout << " *** JUMP RUN *** irun "<<irun;
-// 		if(!SECONDO_GIRO)cout << " (don't worry)";
-// 		else             cout << " (start worring...)";
 		    cout << endl; 
 		}
 //		irun++;
@@ -2770,8 +2834,15 @@
 		cout << " obt "<<obt;
 		cout <<" >> "<<GetRunInfo()->RUNHEADER_OBT<<" "<<GetRunInfo()->RUNTRAILER_OBT;
 	    }
-	    cout << endl; 
-	    cout << endl << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" (run-entry "<<irun<<")"<<endl;
+	    if(DBG)cout << endl; 
+	    if(DBG)cout << endl << " ))))) UPDATE RUN INFO (((((  @iev "<<iev<<" run "<<GetRunInfo()->ID<<" (run-entry "<<irun<<")"<<endl;
+	    // ----------------------------------------------------
+	    // update the tracker parameters 
+	    // (non ho trovato nessun altro modo sicuro di farlo...)
+	    // ----------------------------------------------------
+	    if(!dbc || (dbc && !dbc->IsConnected()) )SetDBConnection();
+	    TrkParams::Set(GetRunInfo() ,dbc);
+	    if(dbc)dbc->Close();
 //	    cout << endl; 
 	    prevshift = 0;
 	    return true;
@@ -3843,17 +3914,17 @@
 //     }
 
     if ( TRK0 ){
-	TrkParams::Load(6);
-	if( !TrkParams::IsLoaded(6) ){
-	    cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- VK-mask not loaded"<<endl;
-	};
-	if(!dbc || (dbc && !dbc->IsConnected()))SetDBConnection();
+// 	TrkParams::Load(6);
+// 	if( !TrkParams::IsLoaded(6) ){
+// 	    cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- VK-mask not loaded"<<endl;
+// 	};
+//	if(!dbc || (dbc && !dbc->IsConnected()))SetDBConnection();
 	TrkParams::SetCalib(run_obj,dbc);
 	TrkParams::LoadCalib( );
 	if( !TrkParams::CalibIsLoaded() ){
 	    cout << " TTree* PamLevel2::GetYodaTree( ) -- WARNING -- Calibration not loaded"<<endl;
 	};
-	dbc->Close(); // EMILIANO, do not leave open connections, open only when needed
+// 	if(dbc)dbc->Close(); // EMILIANO, do not leave open connections, open only when needed
     }
 
 
@@ -3922,8 +3993,8 @@
     do{
 	if(shift>0){	 
 	    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;
+	    if(DBG)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;
+	    if(DBG)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++;
@@ -3971,6 +4042,7 @@
  */
 Bool_t PamLevel2::SetDBConnection(){
 
+//    cout << "PamLevel2::SetDBConnection()" << endl;
     if(DBG){
 	cout<<"~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"<<endl; 
 	cout<<"Connecting to DB"<<endl;