Changing in the format of the GRP object read from OCDB in reconstruction.

ClassDef of AliReconstruction increased.

diff --git a/STEER/AliESDTagCreator.cxx b/STEER/AliESDTagCreator.cxx
index c0a8544813f7a6aa351b220dd445ed7969d175f8..d644c6e7a9ce5c92a3b1f258f9719f52cc2da02b 100644 (file)
--- a/STEER/AliESDTagCreator.cxx
+++ b/STEER/AliESDTagCreator.cxx
@@ -29,6 +29,7 @@
 #include <TList.h>
 #include <TObjString.h>
 #include <TLorentzVector.h>
+#include <TMap.h>
 
 //ROOT-AliEn
 #include <TGrid.h>
@@ -1161,7 +1162,7 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *filepath, Int_t Counte
 }
 
 //_____________________________________________________________________________
-void AliESDTagCreator::CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, TList */*grpList*/) {
+void AliESDTagCreator::CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, TMap */* grpData */) {
   //GRP
   Float_t lhcLuminosity = 0.0;
   TString lhcState = "test";

diff --git a/STEER/AliESDTagCreator.h b/STEER/AliESDTagCreator.h
index 0223bab103a712ec0e68e11edda6e919c35e0252..9778235aaadf340ac8a775aa1700340cff1e8175 100644 (file)
--- a/STEER/AliESDTagCreator.h
+++ b/STEER/AliESDTagCreator.h
@@ -27,6 +27,7 @@
 #include <TSystem.h>
 class TChain;
 class TList;
+class TMap;
 
 #include <AliTagCreator.h>
 
@@ -41,7 +42,7 @@ class AliESDTagCreator : public AliTagCreator {
   AliESDTagCreator();
   ~AliESDTagCreator(); 
 
-  void CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, TList *grpList);
+  void CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, TMap *grpData);
 
   void SetInactiveBranches(const char* branches) {fBranches = branches;}
 

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 88b576c4c5b4bb2af8f4e6cbf3d45ad3d3255923..f3b98c259d426677a9675d1b2f9ac7731be1e41a 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -244,7 +244,7 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename,
   fDiamondProfileTPC(NULL),
   fMeanVertexConstraint(kTRUE),
 
-  fGRPList(NULL),
+  fGRPData(NULL),
 
   fAlignObjArray(NULL),
   fCDBUri(),
@@ -332,7 +332,7 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   fDiamondProfileTPC(NULL),
   fMeanVertexConstraint(rec.fMeanVertexConstraint),
 
-  fGRPList(NULL),
+  fGRPData(NULL),
 
   fAlignObjArray(rec.fAlignObjArray),
   fCDBUri(rec.fCDBUri),
@@ -798,15 +798,14 @@ Bool_t AliReconstruction::InitRun(const char* input)
     fesd->AddObject(fesdf);
   }
 
-  
   // Get the GRP CDB entry
   AliCDBEntry* entryGRP = AliCDBManager::Instance()->Get("GRP/GRP/Data");
        
-  if(entryGRP) {
-       fGRPList = dynamic_cast<TList*> (entryGRP->GetObject());  
-  } else {
+  if (entryGRP) 
+       fGRPData = dynamic_cast<TMap*> (entryGRP->GetObject());  
+  
+  if (!fGRPData)
        AliError("No GRP entry found in OCDB!");
-  }
 
   // Get the diamond profile from OCDB
   AliCDBEntry* entry = AliCDBManager::Instance()
@@ -1277,7 +1276,7 @@ Bool_t AliReconstruction::FinishRun()
   // Create tags for the events in the ESD tree (the ESD tree is always present)
   // In case of empty events the tags will contain dummy values
   AliESDTagCreator *esdtagCreator = new AliESDTagCreator();
-  esdtagCreator->CreateESDTags(fFirstEvent,fLastEvent,fGRPList);
+  esdtagCreator->CreateESDTags(fFirstEvent,fLastEvent,fGRPData);
   if (fWriteAOD) {
     AliWarning("AOD tag creation not supported anymore during reconstruction.");
   }
@@ -2198,8 +2197,8 @@ void AliReconstruction::CleanUp(TFile* file, TFile* fileOld)
        fDiamondProfile = NULL;
        delete fDiamondProfileTPC;
        fDiamondProfileTPC = NULL;
-       delete fGRPList;
-       fGRPList = NULL;
+       delete fGRPData;
+       fGRPData = NULL;
   }
 
 

diff --git a/STEER/AliReconstruction.h b/STEER/AliReconstruction.h
index 3e9000f7c078343728783a136b19fb7b75b555b1..f3f71d6265459895d54014ba254731cd0fcdb7a6 100644 (file)
--- a/STEER/AliReconstruction.h
+++ b/STEER/AliReconstruction.h
@@ -35,6 +35,7 @@ class TFile;
 class TTree;
 class TList;
 class AliQADataMakerRec;
+class TMap;
 
 class AliReconstruction: public TNamed {
 public:
@@ -220,7 +221,7 @@ private:
   AliESDVertex*  fDiamondProfileTPC;       // (x,y) diamond profile from TPC for AliVertexerTracks
   Bool_t         fMeanVertexConstraint; // use fDiamondProfile in AliVertexerTracks
 
-  TList*         fGRPList;            // TList from the GRP/GRP/Data CDB folder
+  TMap*          fGRPData;              // Data from the GRP/GRP/Data CDB folder
 
   TObjArray*    fAlignObjArray;      // array with the alignment objects to be applied to the geometry
 
@@ -253,7 +254,7 @@ private:
   AliVertexerTracks*   ftVertexer;  //! Pointer to the vertexer based on ESD tracks
   Bool_t               fIsNewRunLoader; // galice.root created from scratch (real raw data case)
 
-  ClassDef(AliReconstruction, 22)      // class for running the reconstruction
+  ClassDef(AliReconstruction, 23)      // class for running the reconstruction
 };
 
 #endif