Updates to avoid generation of unused TClonesArray. Bug fixes.
authorhaavard <haavard@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 May 2008 07:30:33 +0000 (07:30 +0000)
committerhaavard <haavard@f7af4fe6-9843-0410-8265-dc069ae4e863>
Tue, 20 May 2008 07:30:33 +0000 (07:30 +0000)
TPC/AliTPCGenDBTemp.cxx
TPC/AliTPCGenDBTemp.h
TPC/AliTPCPreprocessor.cxx

index 0cc3463..428d637 100644 (file)
@@ -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);
index 6826d50..103a110 100644 (file)
@@ -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
  
index ceba913..a369e8d 100644 (file)
@@ -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<numSources; i++ ) {     
-       UInt_t pedestalResult = ExtractPedestals(pedestalSource[i]);
+       pedestalResult = ExtractPedestals(pedestalSource[i]);
        if ( pedestalResult == 0 ) break;
      }
      result += pedestalResult;