i)Retrieving during reconstruction the default GRP CDB entry ii)Getting the GRP TList...

diff --git a/STEER/AliAODTagCreator.cxx b/STEER/AliAODTagCreator.cxx
index 4e619bb..093ca2c 100644 (file)
--- a/STEER/AliAODTagCreator.cxx
+++ b/STEER/AliAODTagCreator.cxx
@@ -265,7 +265,7 @@ Bool_t AliAODTagCreator::ReadCAFCollection(const char *filename) {
   }*/
 
 //__________________________________________________________________________
-void AliAODTagCreator::CreateAODTags(Int_t fFirstEvent, Int_t fLastEvent) {
+void AliAODTagCreator::CreateAODTags(Int_t fFirstEvent, Int_t fLastEvent, TList *grpList) {
   //creates tag files for AODs
   
   Float_t fLowPtCut = 1.0;

diff --git a/STEER/AliAODTagCreator.h b/STEER/AliAODTagCreator.h
index c3a3c74..29bd7fe 100644 (file)
--- a/STEER/AliAODTagCreator.h
+++ b/STEER/AliAODTagCreator.h
@@ -40,7 +40,7 @@ class AliAODTagCreator : public AliTagCreator {
   AliAODTagCreator();
   ~AliAODTagCreator(); 
 
-  void CreateAODTags(Int_t fFirstEvent, Int_t fLastEvent);
+  void CreateAODTags(Int_t fFirstEvent, Int_t fLastEvent, TList *grpList);
 
   Bool_t ReadGridCollection(TGridResult *result);
   Bool_t ReadLocalCollection(const char *localpath);

diff --git a/STEER/AliESDTagCreator.cxx b/STEER/AliESDTagCreator.cxx
index 92182be..9ce7d66 100644 (file)
--- a/STEER/AliESDTagCreator.cxx
+++ b/STEER/AliESDTagCreator.cxx
@@ -1143,7 +1143,7 @@ void AliESDTagCreator::CreateTag(TFile* file, const char *filepath, Int_t Counte
 }
 
 //_____________________________________________________________________________
-void AliESDTagCreator::CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent) {
+void AliESDTagCreator::CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, TList *grpList) {
   //GRP
   Float_t lhcLuminosity = 0.0;
   TString lhcState = "test";

diff --git a/STEER/AliESDTagCreator.h b/STEER/AliESDTagCreator.h
index 4879970..d634a26 100644 (file)
--- a/STEER/AliESDTagCreator.h
+++ b/STEER/AliESDTagCreator.h
@@ -41,7 +41,7 @@ class AliESDTagCreator : public AliTagCreator {
   AliESDTagCreator();
   ~AliESDTagCreator(); 
 
-  void CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent);
+  void CreateESDTags(Int_t fFirstEvent, Int_t fLastEvent, TList *grpList);
 
   Bool_t ReadGridCollection(TGridResult *result);
   Bool_t ReadLocalCollection(const char *localpath);

diff --git a/STEER/AliReconstruction.cxx b/STEER/AliReconstruction.cxx
index 33ade2a..9451e2c 100644 (file)
--- a/STEER/AliReconstruction.cxx
+++ b/STEER/AliReconstruction.cxx
@@ -116,6 +116,7 @@
 
 #include <TArrayF.h>
 #include <TFile.h>
+#include <TList.h>
 #include <TSystem.h>
 #include <TROOT.h>
 #include <TPluginManager.h>
@@ -233,6 +234,8 @@ AliReconstruction::AliReconstruction(const char* gAliceFilename, const char* cdb
   fVertexer(NULL),
   fDiamondProfile(NULL),
 
+  fGRPList(NULL),
+
   fAlignObjArray(NULL),
   fCDBUri(cdbUri),
   fRemoteCDBUri(""),
@@ -292,6 +295,8 @@ AliReconstruction::AliReconstruction(const AliReconstruction& rec) :
   fVertexer(NULL),
   fDiamondProfile(NULL),
 
+  fGRPList(NULL),
+
   fAlignObjArray(rec.fAlignObjArray),
   fCDBUri(rec.fCDBUri),
   fRemoteCDBUri(rec.fRemoteCDBUri),
@@ -679,6 +684,15 @@ Bool_t AliReconstruction::Run(const char* input)
   }
 
   
+  // Get the GRP CDB entry
+  AliCDBEntry* entryGRP = AliCDBManager::Instance()->Get("GRP/GRP/Data");
+       
+  if(entryGRP) {
+       fGRPList = dynamic_cast<TList*> (entryGRP->GetObject());  
+  } else {
+       AliError("No GRP entry found in OCDB!");
+  }
+
   // Get the diamond profile from OCDB
   AliCDBEntry* entry = AliCDBManager::Instance()
        ->Get("GRP/Calib/MeanVertex");
@@ -928,10 +942,10 @@ Bool_t AliReconstruction::Run(const char* input)
   // 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);
+  esdtagCreator->CreateESDTags(fFirstEvent,fLastEvent,fGRPList);
   if (fWriteAOD) {
     AliAODTagCreator *aodtagCreator = new AliAODTagCreator();
-    aodtagCreator->CreateAODTags(fFirstEvent,fLastEvent);
+    aodtagCreator->CreateAODTags(fFirstEvent,fLastEvent,fGRPList);
   }
 
   return kTRUE;
@@ -1800,6 +1814,9 @@ void AliReconstruction::CleanUp(TFile* file, TFile* fileOld)
   delete fDiamondProfile;
   fDiamondProfile = NULL;
 
+  delete fGRPList;
+  fGRPList = NULL;
+
   delete fRunLoader;
   fRunLoader = NULL;
   delete fRawReader;

diff --git a/STEER/AliReconstruction.h b/STEER/AliReconstruction.h
index 46c6549..551020d 100644 (file)
--- a/STEER/AliReconstruction.h
+++ b/STEER/AliReconstruction.h
@@ -31,6 +31,7 @@ class AliESDVertex;
 class AliESDEvent;
 class TFile;
 class TTree;
+class TList;
 class AliQADataMaker;
 
 class AliReconstruction: public TNamed {
@@ -192,6 +193,8 @@ private:
   AliTracker*    fTracker[fgkNDetectors];  //! trackers
   AliESDVertex*  fDiamondProfile;          // (x,y) diamond profile for AliVertexerTracks
 
+  TList*         fGRPList;            // TList from the GRP/GRP/Data CDB folder
+
   TObjArray*    fAlignObjArray;      // array with the alignment objects to be applied to the geometry
 
   TString       fCDBUri;             // Uri of the default CDB storage