--- quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/05/18 13:06:08	1.2
+++ quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/07/13 10:13:37	1.8
@@ -1,8 +1,8 @@
 /**
- * FTrkCalibQLookExpert.cpp
+ * FTrkCalibQLookExpert.cxx
  *
  * autor: D.Fedele
- * version 2.0
+ * version v1r06
  * Parameters:
  * 	file - the data file to analyze
  *      step - select =1 in order to analyze one event at time
@@ -18,6 +18,7 @@
 #include <TPaveText.h>
 #include <TLatex.h>
 #include <TCanvas.h>
+#include <TFile.h>
 #include <TTree.h>
 #include <TGraph.h>
 #include <TStyle.h>
@@ -29,19 +30,7 @@
 #include <CalibTrk2Event.h>
 //
 
-
-void stringcopy(TString& s1, const TString& s2, Int_t from=0, Int_t to=0){    
-    if ( to == 0 ){
-	Int_t t2length = s2.Length();
-	s1 = "";
-	to = t2length;
-    };
-    for (Int_t i = from; i<to; i++){
-	s1.Append(s2[i],1);
-    };
-};
-
- typedef struct caltrk_def{
+typedef struct caltrk_def{
   Int_t good0[2];
   Int_t daqmode[12];
   Int_t dspnum[12];
@@ -69,13 +58,11 @@
 {  
   // 
   //   obtain information about the data file and select the output dir
-  const string filepath=file.Data(); 
-  Int_t dwpos = filepath.rfind("DW_");
-  Int_t dwpos1 = filepath.find(".root");
-  TString fpath=(filepath.c_str());
-  TString base,ffile;
-  stringcopy(base,fpath,0,dwpos);
-  stringcopy(ffile,fpath,dwpos,dwpos1);
+  Int_t dwpos = file.Last('/');
+  Int_t dwpos1 = file.Last('.');
+  TString base,ffile ;
+  ffile=file(dwpos+1,dwpos1-(dwpos+1));
+  if(dwpos>0) base=file(0,dwpos);
 
   TString out;
   if(outdir.Length()==0){
@@ -83,13 +70,14 @@
   }else{
     out = outdir;
   }
+  if(out.Last('/')+1<out.Length()) out+="/";
 
   //
   // inizialise the variables and open the file
   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;
@@ -133,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);
@@ -195,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];
@@ -259,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];
-      };
-    };
+      }
+    }
               
 
     //
@@ -268,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");
@@ -306,13 +305,13 @@
     TH1F *histoasig[12];           //histos of sigma 
     TH1F *histoaped[12];          //histos of pedestals
     
-    Double_t posy = 0.95;    // up y-coord - top pads
-    Double_t hpad = 0.15;   // pad height
-    Double_t posx1=0;          // left  x-coord - pad column
-    Double_t posx2=0;          // right x-coord - pad olumn
-    Double_t posx0=0;          //       x-coord - column division
-    Double_t wrel = 0.6;     // relative x size of first sub-column
-    Double_t marg = 0.004;   // margin among pads
+    Float_t posy = 0.95;    // up y-coord - top pads
+    Float_t hpad = 0.15;   // pad height
+    Float_t posx1=0;          // left  x-coord - pad column
+    Float_t posx2=0;          // right x-coord - pad olumn
+    Float_t posx0=0;          //       x-coord - column division
+    Float_t wrel = 0.6;     // relative x size of first sub-column
+    Float_t marg = 0.004;   // margin among pads
     stringstream title;
     stringstream hid;
 
@@ -335,20 +334,20 @@
       /* -----------> HISTOGRAMS          */
       /* calibration parameters */
       title<<"DSP "<<n+1;
-      hid<<"h"<<n;
+      hid<<"h"<<n<<"i"<<i;
       histosig[n] = new TH1F(hid.str().c_str(),title.str().c_str(),3072,0.5,3072.5);
       hid.str("");
-      hid<<"hh"<<n;
+      hid<<"hh"<<n<<"i"<<i;
       histoped[n] = new TH1F(hid.str().c_str(),title.str().c_str(),3072,0.5,3072.5);
       hid.str("");
-      hid<<"hhh"<<n;
+      hid<<"hhh"<<n<<"i"<<i;
       title.str("");
       hid.str("");
       /* AVERAGE calibration parameters */    
-      hid<<"ah"<<n;
+      hid<<"ah"<<n<<"i"<<i;
       histoasig[n] = new TH1F(hid.str().c_str(),title.str().c_str(),3,0.5,3072.5);
       hid.str("");
-      hid<<"ahh"<<n;
+      hid<<"ahh"<<n<<"i"<<i;
       histoaped[n] = new TH1F(hid.str().c_str(),title.str().c_str(),3,0.5,3072.5);
       hid.str("");
     };                     //end loop on views
@@ -453,7 +452,7 @@
       li.SetLineStyle(3);
       li.SetLineWidth(2);
       
-      Double_t maxhist=0;
+      Float_t maxhist=0;
       TBox b;
       b.SetFillColor(6);
       b.SetFillStyle(3945);
@@ -504,7 +503,7 @@
  
       
       /* plot SIGMA */
-      Double_t max=500.;
+      Float_t max=500.;
       c2->cd();
       trkpadtext[nn]->Draw();
       trkpad2[nn]->SetLogy();