From e2cfbac834a89cd3334ff29805fb99307cee54e2 Mon Sep 17 00:00:00 2001 From: wiechula Date: Wed, 30 Oct 2013 08:44:34 +0000 Subject: [PATCH] o mods --- TPC/Upgrade/AliToyMCEventGenerator.cxx | 8 ++++---- TPC/Upgrade/AliToyMCEventGenerator.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/TPC/Upgrade/AliToyMCEventGenerator.cxx b/TPC/Upgrade/AliToyMCEventGenerator.cxx index c2acbcd0f26..c0f8bc968e3 100644 --- a/TPC/Upgrade/AliToyMCEventGenerator.cxx +++ b/TPC/Upgrade/AliToyMCEventGenerator.cxx @@ -785,7 +785,7 @@ void AliToyMCEventGenerator::SetSCScalingFactor() } //________________________________________________________________ -void AliToyMCEventGenerator::SetCorrectionFromFile(const TString& file, AliTPCCorrection* &corr) +void AliToyMCEventGenerator::SetCorrectionFromFile(TString file, AliTPCCorrection* &corr) { // // read the correction from file and set it to corr @@ -796,9 +796,9 @@ void AliToyMCEventGenerator::SetCorrectionFromFile(const TString& file, AliTPCCo // allow for specifying an object name for the AliTPCCorrection in the file name // separated by a ':' - TObjArray *arr=fCorrectionFile.Tokenize(":"); + TObjArray *arr=file.Tokenize(":"); if (arr->GetEntriesFast()>1) { - fCorrectionFile=arr->At(0)->GetName(); + file=arr->At(0)->GetName(); corrName=arr->At(1)->GetName(); } delete arr; @@ -806,7 +806,7 @@ void AliToyMCEventGenerator::SetCorrectionFromFile(const TString& file, AliTPCCo TFile f(file.Data()); if (!f.IsOpen()||f.IsZombie()) { - AliError(Form("Could not open SC file '%s'",file.Data())); + printf("E-AliToyMCEventGenerator::Could not open SC file '%s'",file.Data()); return; } diff --git a/TPC/Upgrade/AliToyMCEventGenerator.h b/TPC/Upgrade/AliToyMCEventGenerator.h index 67d2288ea35..4cc296caef3 100644 --- a/TPC/Upgrade/AliToyMCEventGenerator.h +++ b/TPC/Upgrade/AliToyMCEventGenerator.h @@ -83,6 +83,7 @@ class AliToyMCEventGenerator : public TObject { Bool_t HasSCList() const { return !fSCListFile.IsNull(); } static Float_t GetSCScalingFactor(AliTPCCorrection *corr, AliTPCCorrection *averageCorr, Float_t &chi2); + static void SetCorrectionFromFile(TString file, AliTPCCorrection* &corr); protected: AliTPCParam *fTPCParam; //! TPC params @@ -114,7 +115,6 @@ class AliToyMCEventGenerator : public TObject { Bool_t fIsLaser; // is a laser event? Bool_t fPrereadSCList; // preread all SC files from the SC list - void SetCorrectionFromFile(const TString& file, AliTPCCorrection* &corr); void InitSpaceChargeList(); void SetSCScalingFactor(); -- 2.43.0