Reading PHOS trigger parameters from OCDB.

diff --git a/OCDB/PHOS/Trigger/Parameters/Run158171_999999_v0_s0.root b/OCDB/PHOS/Trigger/Parameters/Run158171_999999_v0_s0.root
new file mode 100644 (file)
index 0000000..55f764b
Binary files /dev/null and b/OCDB/PHOS/Trigger/Parameters/Run158171_999999_v0_s0.root differ

diff --git a/PHOS/AliPHOSRecoParam.cxx b/PHOS/AliPHOSRecoParam.cxx
index 31c963985d89cc7983cbd166b2cf1a30694833d3..be3ad2b63d4132669afcf46ab3680bd923bccd88 100644 (file)
--- a/PHOS/AliPHOSRecoParam.cxx
+++ b/PHOS/AliPHOSRecoParam.cxx
@@ -28,6 +28,7 @@
 ClassImp(AliPHOSRecoParam)
 
 TObjArray* AliPHOSRecoParam::fgkMaps =0; //ALTRO mappings
+TObject*   AliPHOSRecoParam::fgkTrigParams =0; // Trigger parameters
 
 //-----------------------------------------------------------------------------
 AliPHOSRecoParam::AliPHOSRecoParam() :
@@ -219,3 +220,24 @@ void AliPHOSRecoParam::SetNonlinearityCorrectionVersion(const char * ver){
 
 
 }
+
+//-----------------------------------------------------------------------------
+const TObject* AliPHOSRecoParam::GetTriggerParameters()
+{
+  //Returns trigger parameters.
+
+  //Quick check as follows:
+  //  root [0] AliCDBManager::Instance()->SetDefaultStorage("local://$ALICE_ROOT/OCDB");
+  //  root [1] AliCDBManager::Instance()->SetRun(158171);
+  //  root [2] TObject* parameters = AliPHOSRecoParam::GetTriggerParameters();
+  //  root [3] parameters->Print();
+  
+  if(fgkTrigParams) return fgkTrigParams;
+  
+  AliCDBEntry* entry = AliCDBManager::Instance()->Get("PHOS/Trigger/Parameters");
+  if(entry)
+    fgkTrigParams = entry->GetObject();
+  
+  return fgkTrigParams;
+  
+}

diff --git a/PHOS/AliPHOSRecoParam.h b/PHOS/AliPHOSRecoParam.h
index 28be9c6aaf3df4777a059b0d69f4779361b05a94..bd2c3a888d7192177c150181cf4836c70751b6db 100644 (file)
--- a/PHOS/AliPHOSRecoParam.h
+++ b/PHOS/AliPHOSRecoParam.h
@@ -78,6 +78,7 @@ public:
 
   static AliPHOSRecoParam* GetDefaultParameters();
   static const  TObjArray* GetMappings();
+  static const  TObject*   GetTriggerParameters();
 
 protected:
 
@@ -108,8 +109,9 @@ protected:
   Bool_t  fCPVUnfold;              // CPV: true if overlapped clusters should be unfolded
 
   static TObjArray* fgkMaps;       // ALTRO mappings for RCU0..RCU3
+  static TObject* fgkTrigParams;   // PHOS trigger parameters
 
-  ClassDef(AliPHOSRecoParam,11)
+  ClassDef(AliPHOSRecoParam,12)
 };
 
 #endif

diff --git a/PHOS/AliPHOSReconstructor.cxx b/PHOS/AliPHOSReconstructor.cxx
index c3ce258810eb84ee2fcb851edd0dcdd6fb680c84..e1a8c17f8f3f60f2f087eac8b7098094aa1fb530 100644 (file)
--- a/PHOS/AliPHOSReconstructor.cxx
+++ b/PHOS/AliPHOSReconstructor.cxx
@@ -453,15 +453,12 @@ void  AliPHOSReconstructor::ConvertDigits(AliRawReader* rawReader, TTree* digits
 
   rawReader->Reset();
   AliPHOSTriggerRawDigiProducer tdp(rawReader);
-
-  AliPHOSTriggerParameters* parameters = new AliPHOSTriggerParameters();
-  readTRUParameters(parameters);
+  
+  AliPHOSTriggerParameters* parameters = (AliPHOSTriggerParameters*)AliPHOSRecoParam::GetTriggerParameters();
   
   tdp.SetTriggerParameters(parameters);
   tdp.ProcessEvent(tdigits);
   
-  delete parameters;
-  
   if (AliLog::GetGlobalDebugLevel() == 1) {
     Int_t modMax=-111;
     Int_t colMax=-111;