From f2cb0edff3a8ca466ffff7177307cb2fbb38cb0c Mon Sep 17 00:00:00 2001 From: ekman Date: Tue, 30 May 2006 15:02:50 +0000 Subject: [PATCH] changed saving of files --- PWG0/CorrectionMatrix2D.cxx | 24 ++++++++++++------------ PWG0/CorrectionMatrix2D.h | 3 +-- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/PWG0/CorrectionMatrix2D.cxx b/PWG0/CorrectionMatrix2D.cxx index cf35d666e5f..fdfdd79f140 100644 --- 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 08f4c73a9de..b78dff62145 100644 --- 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); -- 2.39.3