--- quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/05/18 13:06:08	1.2
+++ quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/06/01 17:38:54	1.3
@@ -70,12 +70,13 @@
   // 
   //   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");
+  Int_t dwpos = filepath.rfind("/");
+  Int_t dwpos1 = filepath.rfind(".root");
   TString fpath=(filepath.c_str());
   TString base,ffile;
   stringcopy(base,fpath,0,dwpos);
-  stringcopy(ffile,fpath,dwpos,dwpos1);
+  stringcopy(ffile,fpath,dwpos+1,dwpos1);
+  if(dwpos>0) base+="/";
 
   TString out;
   if(outdir.Length()==0){
@@ -306,13 +307,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;
 
@@ -453,7 +454,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 +505,7 @@
  
       
       /* plot SIGMA */
-      Double_t max=500.;
+      Float_t max=500.;
       c2->cd();
       trkpadtext[nn]->Draw();
       trkpad2[nn]->SetLogy();