--- quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/07/02 17:41:14	1.7
+++ quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/07/13 10:13:37	1.8
@@ -2,7 +2,7 @@
  * FTrkCalibQLookExpert.cxx
  *
  * autor: D.Fedele
- * version v1r05
+ * version v1r06
  * Parameters:
  * 	file - the data file to analyze
  *      step - select =1 in order to analyze one event at time
@@ -77,7 +77,7 @@
   Int_t nevents=0;
   Int_t minevent = 0;
   Int_t maxevent = 0;
-  ULong64_t FOBT[2], HOBT=0, TOBT=0;
+  ULong64_t FOBT[2];
   
   FOBT[0]=0;
   FOBT[1]=0;
@@ -121,7 +121,10 @@
   pamela::EventHeader *eh1=0,*eh2=0,*eh4=0,*eh3=0;
   pamela::PscuHeader *ph=0;
   pamela::CalibTrk1Event *trk1 = 0;
-  pamela::CalibTrk2Event *trk2 = 0;	
+  pamela::CalibTrk2Event *trk2 = 0;
+  pamela::EventCounter *cod=0;	
+  
+  pamela::PacketType *pctp=0;  
   
   hotr = (TTree*)calibFile->Get("CalibHeader");
   hotr->SetBranchAddress("Header", &eh4);
@@ -183,22 +186,29 @@
   //
   //**********************************************************************
     
+  Int_t hcevent=hotr->GetEntries();
+  printf("\n%d\n",hcevent);
+  ULong64_t HOBT[hcevent], TOBT[hcevent];
+  for (Int_t i = 0; i < hcevent; i++){ 
+    totr->GetEntry(i);
+    hotr->GetEntry(i); 
+    ph = eh4->GetPscuHeader();
+    HOBT[i]= ph->GetOrbitalTime();
+    ph = eh3->GetPscuHeader();
+    TOBT[i]= ph->GetOrbitalTime();
+  }
+    
   printf("\n Scan of calibration packets from %i to %i ... \n\n",minevent+1,maxevent);
   for (Int_t i = minevent; i < maxevent; i++){     
      
     otr1->GetEntry(i); 
-    otr2->GetEntry(i); 
-    totr->GetEntry(i);
-    hotr->GetEntry(i);
-    ph = eh4->GetPscuHeader();
-    HOBT= ph->GetOrbitalTime();
-    ph = eh3->GetPscuHeader();
-    TOBT= ph->GetOrbitalTime();
-      
+    otr2->GetEntry(i);
+    
     ctrk.good0[0]=trk1->good0;
     ctrk.good0[1]=trk2->good0;
     for (Int_t m = 0; m < 6; m++){
       ph = eh1->GetPscuHeader();
+      cod = eh1->GetCounter();
       FOBT[0]= ph->GetOrbitalTime();
       ctrk.daqmode[trk1->DSPnumber[m]-1]=trk1->DAQmode[m];
       ctrk.dspnum[trk1->DSPnumber[m]-1]=trk1->DSPnumber[m];
@@ -247,8 +257,8 @@
 	ctrk.dspped[trk2->DSPnumber[m]-1][j]=trk2->DSPped_par[m][j];
 	ctrk.dspsig[trk2->DSPnumber[m]-1][j]=trk2->DSPsig_par[m][j];
 	ctrk.dspbad[trk2->DSPnumber[m]-1][j]=trk2->DSPbad_par[m][j];
-      };
-    };
+      }
+    }
               
 
     //
@@ -256,7 +266,8 @@
     Int_t risposta=0;
     stringstream fromfile;
 
-    fromfile<<"FTrkCalibQLook_EXPERT      File: "<<ffile<<"        -- CalibHeader OBT= "<<HOBT<<" -- Calib pkt OBT= "<<FOBT[0]<<" -- CalibTrailer OBT= "<<TOBT<<" --";
+    printf("\n\t%d\n",cod->Get(pctp->CalibHeader));
+    fromfile<<"FTrkCalibQLook_EXPERT      File: "<<ffile<<"        -- CalibHeader OBT= "<<HOBT[(cod->Get(pctp->CalibHeader))-1]<<" -- Calib pkt OBT= "<<FOBT[0]<<" -- CalibTrailer OBT= "<<TOBT[(cod->Get(pctp->CalibHeader))-1]<<" --";
     
     gStyle->SetLabelSize(0.08,"x");
     gStyle->SetLabelSize(0.08,"y");