--- quicklook/tracker/flight/macros/FTrkCalibQLook_BASIC.cxx 2006/09/19 15:15:42 1.8 +++ quicklook/tracker/flight/macros/FTrkCalibQLook_BASIC.cxx 2014/01/17 15:10:38 1.11 @@ -2,7 +2,7 @@ * FTrkCalibQLook_BASIC.cxx * * autor: D.Fedele - * version v1r10 + * version v1r11 * Parameters: * file - the data file to analyze * fromevent - first event to analyze @@ -19,6 +19,10 @@ #include #include #include +#include +#include +#include +#include // #include #include @@ -26,7 +30,7 @@ #include // -typedef struct caltrk_def{ +struct caltrk_def{ Int_t good0[2]; Int_t daqmode[12]; Int_t dspnum[12]; @@ -74,7 +78,7 @@ Int_t nevents=0; Int_t minevent = 0; Int_t maxevent = 0; - ULong64_t OBT[2]; + ULong_t OBT[2]; OBT[0]=0; OBT[1]=0; @@ -192,7 +196,7 @@ Int_t canvasx=900; Int_t canvasy=1200; - Int_t ndsp =0,alarm=0; + Int_t alarm=0; Float_t pedav[12][12],pedavtemp[12][12],sigav[12][12],sigavtemp[12][12]; Int_t flpedav[12][12],flsigav[12][12]; Float_t siglimsup[12][12],sigliminf[12][12],pedlimsup[12][12],pedliminf[12][12]; @@ -341,14 +345,15 @@ } } - Int_t nn,ok=0; + Int_t nn=0,ok=0; // // write warning if it occur for(Int_t n = 0; n<12; n++){ - ndsp = ctrk.dspnum[n]; - nn = ndsp-1; + if(ctrk.dspnum[n]==0) + continue; + nn = ctrk.dspnum[n]-1; for(Int_t iii=0;iii<3;iii++){ if(ctrk.crc_c[nn][iii]!=0){ @@ -415,7 +420,7 @@ space[wc]-=spacep; } - if(ctrk.good0[0]==1 && ctrk.good0[1]==1){ + // if(ctrk.good0[0]==1 && ctrk.good0[1]==1){ // // evaluate the mean value of the sigma and pedestal for(Int_t j = 0; j < 3072; j++){ @@ -476,9 +481,10 @@ } } } - } + // } } - if(ok==0 && ctrk.good0[0]==1 && ctrk.good0[1]==1){ + if(ok==0){ +// if(ok==0 && ctrk.good0[0]==1 && ctrk.good0[1]==1){ if(space[wc]<=10){ wc+=1; flcanvas+=1;