changed saving of files

diff --git a/PWG0/CorrectionMatrix2D.cxx b/PWG0/CorrectionMatrix2D.cxx
index cf35d666e5ffcfe53070b7ea15beb620307aa8c6..fdfdd79f140a46af7c99bd3e98dae7fbd98a41ff 100644 (file)
--- a/PWG0/CorrectionMatrix2D.cxx
+++ b/PWG0/CorrectionMatrix2D.cxx
@@ -265,13 +265,18 @@ Bool_t CorrectionMatrix2D::LoadHistograms(Char_t* fileName, Char_t* dir) {
   if(fhCorr)  {delete fhCorr;  fhCorr=0;}
   if(fhMeas)  {delete fhMeas;  fhMeas=0;}
   
-  fhMeas  = (TH2F*)fin->Get(Form("%s/meas_%s",dir,fName.Data()));
-      if(!fhMeas)  Info("LoadHistograms","No meas  hist available");
-  fhGene  = (TH2F*)fin->Get(Form("%s/gene_%s",dir,fName.Data()));
-      if(!fhGene)  Info("LoadHistograms","No gene  hist available");
-  fhCorr  = (TH2F*)fin->Get(Form("%s/corr_%s",dir,fName.Data()));
-      if(!fhCorr) {Info("LoadHistograms","No corr  hist available");
-      return kFALSE;}
+  fhMeas  = (TH2F*)fin->Get(Form("%s/meas_%s", dir,GetName()));
+  if(!fhMeas)  Info("LoadHistograms","No meas  hist available");
+  
+  fhGene  = (TH2F*)fin->Get(Form("%s/gene_%s",dir, GetName()));
+  if(!fhGene)  Info("LoadHistograms","No gene  hist available");
+  
+  fhCorr  = (TH2F*)fin->Get(Form("%s/corr_%s",dir, GetName()));
+  if(!fhCorr) 
+  {
+    Info("LoadHistograms","No corr  hist available");
+    return kFALSE;
+  }
       
   return kTRUE;
 }
@@ -284,16 +289,11 @@ CorrectionMatrix2D::SaveHistograms() {
   // saves the histograms 
   //
   
-  gDirectory->mkdir(fName.Data());
-  gDirectory->cd(fName.Data());
-  
   fhMeas ->Write();
   fhGene ->Write();
 
   if (fhCorr)
     fhCorr->Write();
-
-  gDirectory->cd("../");
 }
 
 //____________________________________________________________________

diff --git a/PWG0/CorrectionMatrix2D.h b/PWG0/CorrectionMatrix2D.h
index 08f4c73a9de464b0cc88f05fc7551b4f7274e6ec..b78dff62145f669a2c2106931910251bc24c586f 100644 (file)
--- a/PWG0/CorrectionMatrix2D.h
+++ b/PWG0/CorrectionMatrix2D.h
@@ -60,8 +60,7 @@ public:
   void SaveHistograms();
   void DrawHistograms();  
 
-  Bool_t  LoadHistograms(Char_t* fileName, Char_t* dir);
-  Bool_t  LoadCorrection(Char_t* fileName, Char_t* dir) {return LoadHistograms(fileName, dir);}
+  Bool_t  LoadHistograms(Char_t* fileName, Char_t* dir = ".");
   
   void    RemoveEdges(Float_t cut=2, Int_t nBinsX=0, Int_t nBinsY=0);