--- quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/08/22 15:47:48	1.11
+++ quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/09/19 15:15:42	1.14
@@ -2,7 +2,7 @@
  * FTrkCalibQLookExpert.cxx
  *
  * autor: D.Fedele
- * version v1r10
+ * version v1r12
  * Parameters:
  * 	file - the data file to analyze
  *      step - select =1 in order to analyze one event at time
@@ -176,7 +176,7 @@
     } else if (toevent > nevents) {	   
       maxevent = nevents;
     } else {	   
-      maxevent = fromevent;
+      maxevent = nevents;
     };
   };
     
@@ -212,53 +212,61 @@
       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];
-      ctrk.calibnum[trk1->DSPnumber[m]-1]=trk1->calibnumber[m];
-      ctrk.ncalev[trk1->DSPnumber[m]-1]=trk1->ncalib_event[m];
-      ctrk.ped1[trk1->DSPnumber[m]-1]=trk1->ped_l1[m];
-      ctrk.ped2[trk1->DSPnumber[m]-1]=trk1->ped_l2[m];
-      ctrk.ped3[trk1->DSPnumber[m]-1]=trk1->ped_l3[m];
-      ctrk.sig1[trk1->DSPnumber[m]-1]=trk1->sig_l1[m];
-      ctrk.sig2[trk1->DSPnumber[m]-1]=trk1->sig_l2[m];
-      ctrk.sig3[trk1->DSPnumber[m]-1]=trk1->sig_l3[m];
-      ctrk.nbad1[trk1->DSPnumber[m]-1]=trk1->nbad_l1[m];
-      ctrk.nbad2[trk1->DSPnumber[m]-1]=trk1->nbad_l2[m];
-      ctrk.nbad3[trk1->DSPnumber[m]-1]=trk1->nbad_l3[m];
-      ctrk.calfl[trk1->DSPnumber[m]-1]=trk1->cal_flag[m];
-      ctrk.crc_c[trk1->DSPnumber[m]-1][0]=trk1->crc_cal[m][0];
-      ctrk.crc_c[trk1->DSPnumber[m]-1][1]=trk1->crc_cal[m][1];
-      ctrk.crc_c[trk1->DSPnumber[m]-1][2]=trk1->crc_cal[m][2];
-      ctrk.crc_hc[trk1->DSPnumber[m]-1]=trk1->crc_hcal[m];
-      for (Int_t j = 0; j < 3072; j++){
-	ctrk.dspped[trk1->DSPnumber[m]-1][j]=trk1->DSPped_par[m][j];
-	ctrk.dspsig[trk1->DSPnumber[m]-1][j]=trk1->DSPsig_par[m][j];
-	ctrk.dspbad[trk1->DSPnumber[m]-1][j]=trk1->DSPbad_par[m][j];
-      };
+      if(trk1->DSPnumber[m]>0){
+	if(trk1->DSPnumber[m]<13){
+	  ctrk.daqmode[trk1->DSPnumber[m]-1]=trk1->DAQmode[m];
+	  ctrk.dspnum[trk1->DSPnumber[m]-1]=trk1->DSPnumber[m];
+	  ctrk.calibnum[trk1->DSPnumber[m]-1]=trk1->calibnumber[m];
+	  ctrk.ncalev[trk1->DSPnumber[m]-1]=trk1->ncalib_event[m];
+	  ctrk.ped1[trk1->DSPnumber[m]-1]=trk1->ped_l1[m];
+	  ctrk.ped2[trk1->DSPnumber[m]-1]=trk1->ped_l2[m];
+	  ctrk.ped3[trk1->DSPnumber[m]-1]=trk1->ped_l3[m];
+	  ctrk.sig1[trk1->DSPnumber[m]-1]=trk1->sig_l1[m];
+	  ctrk.sig2[trk1->DSPnumber[m]-1]=trk1->sig_l2[m];
+	  ctrk.sig3[trk1->DSPnumber[m]-1]=trk1->sig_l3[m];
+	  ctrk.nbad1[trk1->DSPnumber[m]-1]=trk1->nbad_l1[m];
+	  ctrk.nbad2[trk1->DSPnumber[m]-1]=trk1->nbad_l2[m];
+	  ctrk.nbad3[trk1->DSPnumber[m]-1]=trk1->nbad_l3[m];
+	  ctrk.calfl[trk1->DSPnumber[m]-1]=trk1->cal_flag[m];
+	  ctrk.crc_c[trk1->DSPnumber[m]-1][0]=trk1->crc_cal[m][0];
+	  ctrk.crc_c[trk1->DSPnumber[m]-1][1]=trk1->crc_cal[m][1];
+	  ctrk.crc_c[trk1->DSPnumber[m]-1][2]=trk1->crc_cal[m][2];
+	  ctrk.crc_hc[trk1->DSPnumber[m]-1]=trk1->crc_hcal[m];
+	  for (Int_t j = 0; j < 3072; j++){
+	    ctrk.dspped[trk1->DSPnumber[m]-1][j]=trk1->DSPped_par[m][j];
+	    ctrk.dspsig[trk1->DSPnumber[m]-1][j]=trk1->DSPsig_par[m][j];
+	    ctrk.dspbad[trk1->DSPnumber[m]-1][j]=trk1->DSPbad_par[m][j];
+	  };
+	}
+      }
       ph = eh2->GetPscuHeader();
       FOBT[1]= ph->GetOrbitalTime();
-      ctrk.daqmode[trk2->DSPnumber[m]-1]=trk2->DAQmode[m];
-      ctrk.dspnum[trk2->DSPnumber[m]-1]=trk2->DSPnumber[m];
-      ctrk.calibnum[trk2->DSPnumber[m]-1]=trk2->calibnumber[m];
-      ctrk.ncalev[trk2->DSPnumber[m]-1]=trk2->ncalib_event[m];
-      ctrk.ped1[trk2->DSPnumber[m]-1]=trk2->ped_l1[m];
-      ctrk.ped2[trk2->DSPnumber[m]-1]=trk2->ped_l2[m];
-      ctrk.ped3[trk2->DSPnumber[m]-1]=trk2->ped_l3[m];
-      ctrk.sig1[trk2->DSPnumber[m]-1]=trk2->sig_l1[m];
-      ctrk.sig2[trk2->DSPnumber[m]-1]=trk2->sig_l2[m];
-      ctrk.sig3[trk2->DSPnumber[m]-1]=trk2->sig_l3[m];
-      ctrk.nbad1[trk2->DSPnumber[m]-1]=trk2->nbad_l1[m];
-      ctrk.nbad2[trk2->DSPnumber[m]-1]=trk2->nbad_l2[m];
-      ctrk.nbad3[trk2->DSPnumber[m]-1]=trk2->nbad_l3[m];
-      ctrk.calfl[trk2->DSPnumber[m]-1]=trk2->cal_flag[m];
-      ctrk.crc_c[trk1->DSPnumber[m]-1][0]=trk2->crc_cal[m][0];
-      ctrk.crc_c[trk1->DSPnumber[m]-1][1]=trk2->crc_cal[m][1];
-      ctrk.crc_c[trk1->DSPnumber[m]-1][2]=trk2->crc_cal[m][2];
-      ctrk.crc_hc[trk1->DSPnumber[m]-1]=trk2->crc_hcal[m];
-      for (Int_t j = 0; j < 3072; j++){
-	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];
+      if(trk2->DSPnumber[m]>0){
+	if(trk2->DSPnumber[m]<13){
+	  ctrk.daqmode[trk2->DSPnumber[m]-1]=trk2->DAQmode[m];
+	  ctrk.dspnum[trk2->DSPnumber[m]-1]=trk2->DSPnumber[m];
+	  ctrk.calibnum[trk2->DSPnumber[m]-1]=trk2->calibnumber[m];
+	  ctrk.ncalev[trk2->DSPnumber[m]-1]=trk2->ncalib_event[m];
+	  ctrk.ped1[trk2->DSPnumber[m]-1]=trk2->ped_l1[m];
+	  ctrk.ped2[trk2->DSPnumber[m]-1]=trk2->ped_l2[m];
+	  ctrk.ped3[trk2->DSPnumber[m]-1]=trk2->ped_l3[m];
+	  ctrk.sig1[trk2->DSPnumber[m]-1]=trk2->sig_l1[m];
+	  ctrk.sig2[trk2->DSPnumber[m]-1]=trk2->sig_l2[m];
+	  ctrk.sig3[trk2->DSPnumber[m]-1]=trk2->sig_l3[m];
+	  ctrk.nbad1[trk2->DSPnumber[m]-1]=trk2->nbad_l1[m];
+	  ctrk.nbad2[trk2->DSPnumber[m]-1]=trk2->nbad_l2[m];
+	  ctrk.nbad3[trk2->DSPnumber[m]-1]=trk2->nbad_l3[m];
+	  ctrk.calfl[trk2->DSPnumber[m]-1]=trk2->cal_flag[m];
+	  ctrk.crc_c[trk1->DSPnumber[m]-1][0]=trk2->crc_cal[m][0];
+	  ctrk.crc_c[trk1->DSPnumber[m]-1][1]=trk2->crc_cal[m][1];
+	  ctrk.crc_c[trk1->DSPnumber[m]-1][2]=trk2->crc_cal[m][2];
+	  ctrk.crc_hc[trk1->DSPnumber[m]-1]=trk2->crc_hcal[m];
+	  for (Int_t j = 0; j < 3072; j++){
+	    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];
+	  }
+	}
       }
     }
               
@@ -545,11 +553,12 @@
 	  b.SetFillColor(6);
 	  b.SetFillStyle(3945);
 	  b.DrawBox(2560.,2200.,2816.,maxhist);
-	  b.DrawBox(1024.,2200.,1792.,maxhist);
+	  b.DrawBox(1024.,2200.,1535.,maxhist);
 	  
 	  b.SetFillColor(107);
 	  b.SetFillStyle(3954);
 	  b.DrawBox(512.,2200.,768.,maxhist);
+	  b.DrawBox(1536.,2200.,1792.,maxhist);
 	}
 	else if(nn==7){
 	  maxhist=histoped[nn]->GetMaximum();
@@ -567,6 +576,7 @@
 	  b.SetFillStyle(3954);
 	  b.DrawBox(0.,700.,512.,maxhist);
 	  b.DrawBox(1920.,700.,2048.,maxhist);
+	  b.DrawBox(2176.,700.,2304.,maxhist);
 	}
       }
       else histoped[nn]->Draw("axis");
@@ -625,11 +635,12 @@
 	  b.SetFillColor(6);
 	  b.SetFillStyle(3945);
 	  b.DrawBox(2560.,0.,2816.,maxhist);
-	  b.DrawBox(1024.,0.,1792.,maxhist);
+	  b.DrawBox(1024.,0.,1535.,maxhist);
 	  
 	  b.SetFillColor(107);
 	  b.SetFillStyle(3954);
 	  b.DrawBox(512.,0.,768.,maxhist);
+	  b.DrawBox(1536.,0.,1792.,maxhist);
 	}
 	else if(nn==7){
 	  maxhist=histosig[nn]->GetMaximum();
@@ -647,6 +658,7 @@
 	  b.SetFillStyle(3954);
 	  b.DrawBox(0.,0.,512.,maxhist);
 	  b.DrawBox(1920.,0.,2048.,maxhist);
+	  b.DrawBox(2176.,0.,2304.,maxhist);
 	}
       }
       else histosig[nn]->Draw("axis");