Updates to avoid generation of unused TClonesArray. Bug fixes.

diff --git a/TPC/AliTPCGenDBTemp.cxx b/TPC/AliTPCGenDBTemp.cxx
index 0cc34633c20a569585d180010a714b871db48041..428d63735b25ce076e7fe44a55d08c777bd4f79f 100644 (file)
--- 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,"");
   //
   // 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;
 }
   return tree;
 }

+

 //______________________________________________________________________________________________
 void AliTPCGenDBTemp::MakeConfig(const char *file, Int_t firstRun, Int_t lastRun, 
 //______________________________________________________________________________________________
 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
    //
 
 {
    //
    // Store Configuration file to OCDB
    //
 

-   TTree *tree = ReadListTree(file,"tempConf",amandaString);
+   TTree *tree = ReadListTree(file,"tempConf");

    SetConfTree(tree);
    SetFirstRun(firstRun);
    SetLastRun(lastRun);
    SetConfTree(tree);
    SetFirstRun(firstRun);
    SetLastRun(lastRun);

diff --git a/TPC/AliTPCGenDBTemp.h b/TPC/AliTPCGenDBTemp.h
index 6826d508111087e83126ecb3dc88b0d10260a3ba..103a1103383b32cd033745fdb3e18f9df47f6000 100644 (file)
--- 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 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);
 
 // 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
  
 
 // getters/setters
  

diff --git a/TPC/AliTPCPreprocessor.cxx b/TPC/AliTPCPreprocessor.cxx
index ceba9134d170faa9c6127ab84c992437fc944b6c..a369e8d5e52d15813828f024b8784d536a67870b 100644 (file)
--- 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<numSources; i++ ) {     
      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;
        if ( pedestalResult == 0 ) break;
      }
      result += pedestalResult;