--- quicklook/tracker/flight/macros/FTrkCalibQLook_BASIC.cxx	2006/05/10 10:06:54	1.1
+++ quicklook/tracker/flight/macros/FTrkCalibQLook_BASIC.cxx	2006/06/29 11:11:59	1.4
@@ -2,7 +2,7 @@
  * FTrkCalibQLook_BASIC.cxx
  *
  * autor: D.Fedele
- * version 2.0
+ * version v1r04
  * Parameters:
  * 	file - the data file to analyze
  *      fromevent - first event to analyze
@@ -15,6 +15,7 @@
 #include <TLatex.h>
 #include <TCanvas.h>
 #include <TGraph.h>
+#include <TFile.h>
 #include <TTree.h>
 #include <TStyle.h>
 #include <TString.h>
@@ -25,18 +26,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];
@@ -65,12 +55,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){
@@ -78,7 +67,8 @@
   }else{
     out = outdir;
   };
-  
+  if(out.Last('/')+1<out.Length()) out+="/";
+
   //
   // inizialise the variables and open the file
   struct caltrk_def ctrk;
@@ -212,10 +202,16 @@
   // inizialize the limits for simga and pedestall
   for(Int_t i=0;i<12;i++){
     for(Int_t ii=0;ii<12;ii++){
-      siglimsup[i][ii]=20.;
-      sigliminf[i][ii]=0.;
-      pedlimsup[i][ii]=3500.;
-      pedliminf[i][ii]=50.;
+      siglimsup[i][ii]=30.;
+      sigliminf[i][ii]=1.5;
+      if(!(i%2)){
+	pedlimsup[i][ii]=3700.;
+	pedliminf[i][ii]=1700.;
+      }
+      else{
+	pedlimsup[i][ii]=2200.;
+	pedliminf[i][ii]=200.;
+      }
     }
   }
   
@@ -236,11 +232,10 @@
       if(trk2->cal_flag[m]!=0) alarm+=1;
     }  
   }
-  const Int_t cnum=alarm/30 + 10;
+  const Int_t cnum=alarm/30 + 100;
   Int_t flcanvas=1;
   Float_t spacep=1.5,space[cnum];
-  TCanvas *c[cnum];
-  
+  TCanvas *c[cnum]; 
   //
   //  create output canvas  
   for(Int_t i=0;i<cnum;i++){
@@ -251,6 +246,7 @@
     rep<<"FTrkCalibQLook_BASIC_pag"<<i+1;
     c[i]=new TCanvas(tit.str().c_str(),rep.str().c_str(),canvasx,canvasy);
     c[i]->Range(0,0,100,100);
+    c[i]->SetFillColor(10);
     tzz->DrawLatex(1,98.5,fromfile.str().c_str());
     rep.str("");
     rep<<"CALIBRATION REPORT pag"<<i+1;
@@ -427,52 +423,55 @@
 	  if(pedav[nn][ii]>pedlimsup[nn][ii] || pedav[nn][ii]<pedliminf[nn][ii]) flpedav[nn][ii]=1;  
 	  if(sigav[nn][ii]>siglimsup[nn][ii] || sigav[nn][ii]<sigliminf[nn][ii]) flsigav[nn][ii]=1; 
 
-	  if(flpedav[nn][ii]==1){
-	    ok=1;
-	    if(space[wc]<=3){
-	      wc+=1;
-	      flcanvas+=1;
+	  if((nn==1 && ii==11)||(nn==6 && ii==2)||(nn==6 && ii==4)||(nn==6 && ii==5)||(nn==6 && ii==6)||(nn==6 && ii==10)||(nn==11 && ii==3))
+	    continue;
+	  else{
+	    if(flpedav[nn][ii]==1){
+	      ok=1;
+	      if(space[wc]<=3){
+		wc+=1;
+		flcanvas+=1;
+	      }
+	      c[wc]->cd();
+	      tzz->SetTextFont(40);
+	      tzz->SetTextSize(0.02);
+	      tzz->SetTextAlign(13);
+	      tzz->SetTextColor(50);
+	      rep<<"********************************************************************************************************************************";
+	      tzz->DrawLatex(2,space[wc],rep.str().c_str());
+	      rep.str("");
+	      space[wc]-=spacep;
+	      rep<<"WARNING >>> CALIBRATION pkt "<<i+1<<" -->CalibTrk"<<(nn+1)%2+1<<" at OBT: "<<OBT[(nn+1)%2]<<"-->DSP "<<nn+1<<" -VA1 "<<2*ii+1<<"-"<<2*ii+2<<" --> <PED>= "<<pedav[nn][ii];
+	      tzz->DrawLatex(2,space[wc],rep.str().c_str());
+	      rep.str("");
+	      space[wc]-=spacep;
 	    }
-	    c[wc]->cd();
-	    tzz->SetTextFont(40);
-	    tzz->SetTextSize(0.02);
-	    tzz->SetTextAlign(13);
-	    tzz->SetTextColor(50);
-	    rep<<"********************************************************************************************************************************";
-	    tzz->DrawLatex(2,space[wc],rep.str().c_str());
-	    rep.str("");
-	    space[wc]-=spacep;
-	    rep<<"WARNING >>> CALIBRATION pkt "<<i+1<<" -->CalibTrk"<<(nn+1)%2+1<<" at OBT: "<<OBT[(nn+1)%2]<<"-->DSP "<<nn+1<<" -VA1 "<<2*ii+1<<"-"<<2*ii+2<<" --> <PED>= "<<pedav[nn][ii];
-	    tzz->DrawLatex(2,space[wc],rep.str().c_str());
-	    rep.str("");
-	    space[wc]-=spacep;
-	  }
-
-	  if(flsigav[nn][ii]==1){
-	    ok=1;
-	    if(space[wc]<=3){
-	      wc+=1;
-	      flcanvas+=1;
+	       
+	    if(flsigav[nn][ii]==1){
+	      ok=1;
+	      if(space[wc]<=3){
+		wc+=1;
+		flcanvas+=1;
+	      }
+	      c[wc]->cd();
+	      tzz->SetTextFont(40);
+	      tzz->SetTextSize(0.02);
+	      tzz->SetTextAlign(13);
+	      tzz->SetTextColor(50);
+	      rep<<"********************************************************************************************************************************";
+	      tzz->DrawLatex(2,space[wc],rep.str().c_str());
+	      rep.str("");
+	      space[wc]-=spacep;
+	      rep<<"WARNING >>> CALIBRATION pkt "<<i+1<<" -->CalibTrk"<<(nn+1)%2+1<<" at OBT: "<<OBT[(nn+1)%2]<<"-->DSP "<<nn+1<<" -VA1 "<<2*ii+1<<"-"<<2*ii+2<<" --> <SIG>= "<<sigav[nn][ii];
+	      tzz->DrawLatex(2,space[wc],rep.str().c_str());
+	      rep.str("");
+	      space[wc]-=spacep;
 	    }
-	    c[wc]->cd();
-	    tzz->SetTextFont(40);
-	    tzz->SetTextSize(0.02);
-	    tzz->SetTextAlign(13);
-	    tzz->SetTextColor(50);
-	    rep<<"********************************************************************************************************************************";
-	    tzz->DrawLatex(2,space[wc],rep.str().c_str());
-	    rep.str("");
-	    space[wc]-=spacep;
-	    rep<<"WARNING >>> CALIBRATION pkt "<<i+1<<" -->CalibTrk"<<(nn+1)%2+1<<" at OBT: "<<OBT[(nn+1)%2]<<"-->DSP "<<nn+1<<" -VA1 "<<2*ii+1<<"-"<<2*ii+2<<" --> <SIG>= "<<sigav[nn][ii];
-	    tzz->DrawLatex(2,space[wc],rep.str().c_str());
-	    rep.str("");
-	    space[wc]-=spacep;
 	  }
 	}
       }
     }
-    
-    if(ok==0 && ctrk.good0[0]==1 && ctrk.good0[1]==1){  
+    if(ok==0 && ctrk.good0[0]==1 && ctrk.good0[1]==1){ 
       if(space[wc]<=10){
 	wc+=1;
 	flcanvas+=1;