--- quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/06/08 17:03:57	1.5
+++ quicklook/tracker/flight/macros/FTrkCalibQLook_EXPERT.cxx	2006/06/29 11:11:59	1.6
@@ -1,8 +1,8 @@
 /**
- * FTrkCalibQLookExpert.cpp
+ * FTrkCalibQLookExpert.cxx
  *
  * autor: D.Fedele
- * version 3.0
+ * version v1r04
  * 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];
@@ -70,13 +59,11 @@
   // 
   //   obtain information about the data file and select the output dir
   const string filepath=file.Data(); 
-  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+1,dwpos1);
-  if(dwpos>0) base+="/";
+  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){
@@ -84,6 +71,7 @@
   }else{
     out = outdir;
   }
+  if(out.Last('/')+1<out.Length()) out+="/";
 
   //
   // inizialise the variables and open the file