From 453bd59623321a8c716ed3205483f24b1494c479 Mon Sep 17 00:00:00 2001 From: haavard Date: Tue, 20 May 2008 07:30:33 +0000 Subject: [PATCH] Updates to avoid generation of unused TClonesArray. Bug fixes. --- TPC/AliTPCGenDBTemp.cxx | 16 ++++------------ TPC/AliTPCGenDBTemp.h | 5 ++--- TPC/AliTPCPreprocessor.cxx | 2 +- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/TPC/AliTPCGenDBTemp.cxx b/TPC/AliTPCGenDBTemp.cxx index 0cc34633c20..428d63735b2 100644 --- a/TPC/AliTPCGenDBTemp.cxx +++ b/TPC/AliTPCGenDBTemp.cxx @@ -127,32 +127,24 @@ TClonesArray * AliTPCGenDBTemp::ReadList(const char *fname, const char *title, //______________________________________________________________________________________________ -TTree * AliTPCGenDBTemp::ReadListTree(const char *fname, const char *title, - const TString& amandaString) { +TTree * AliTPCGenDBTemp::ReadListTree(const char *fname, const char *title) { // // read values from ascii file // TTree* tree = new TTree(title,title); tree->ReadFile(fname,""); - TClonesArray *arr; - if ( amandaString.Length()== 0 ) { - arr = AliTPCSensorTemp::ReadTree(tree); - } else { - arr = AliTPCSensorTemp::ReadTree(tree,amandaString); - } - arr->Delete(); - delete arr; return tree; } + //______________________________________________________________________________________________ void AliTPCGenDBTemp::MakeConfig(const char *file, Int_t firstRun, Int_t lastRun, - const char *confDir, const TString& amandaString) + const char *confDir) { // // Store Configuration file to OCDB // - TTree *tree = ReadListTree(file,"tempConf",amandaString); + TTree *tree = ReadListTree(file,"tempConf"); SetConfTree(tree); SetFirstRun(firstRun); SetLastRun(lastRun); diff --git a/TPC/AliTPCGenDBTemp.h b/TPC/AliTPCGenDBTemp.h index 6826d508111..103a1103383 100644 --- a/TPC/AliTPCGenDBTemp.h +++ b/TPC/AliTPCGenDBTemp.h @@ -32,14 +32,13 @@ public: const TTimeStamp& endTime, Int_t run, const TString& amandaString=0); void MakeConfig(const char *file, Int_t firstRun, Int_t lastRun, - const char *confDir, const TString& amandaString=0); + const char *confDir); // functionality static TClonesArray* ReadList(const char* fname, const char *title="tempConf", const TString& amandaString=0); - static TTree* ReadListTree(const char* fname, const char *title="tempConf", - const TString& amandaString=0); + static TTree* ReadListTree(const char* fname, const char *title="tempConf"); // getters/setters diff --git a/TPC/AliTPCPreprocessor.cxx b/TPC/AliTPCPreprocessor.cxx index ceba9134d17..a369e8d5e52 100644 --- a/TPC/AliTPCPreprocessor.cxx +++ b/TPC/AliTPCPreprocessor.cxx @@ -254,7 +254,7 @@ UInt_t AliTPCPreprocessor::Process(TMap* dcsAliasMap) if (source == "DAQHLT" ) numSources=2; UInt_t pedestalResult=0; for (Int_t i=0; i