Merge remote-tracking branch 'origin/master' into flatdev

[u/mrichter/AliRoot.git] / HLT / trigger / AliHLTTriggerCaloClusterEnergy.cxx

diff --git a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
index 3973b8dc2a630b7f7b0fda2edb6a14c69b3456d0..48e6f2d6e1bb0bcc82747ab2cb44f90c26a26a38 100644 (file)
--- a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
+++ b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
@@ -37,6 +37,7 @@
 #include "AliHLTCaloClusterDataStruct.h"
 #include "TRefArray.h"
 #include "TString.h"
+#include "TMap.h"
 
 /** ROOT macro for the implementation of ROOT specific class methods */
 ClassImp(AliHLTTriggerCaloClusterEnergy)
@@ -47,8 +48,8 @@ AliHLTTriggerCaloClusterEnergy::AliHLTTriggerCaloClusterEnergy(TString detector)
   fClustersRefs(NULL),
   fDetector(detector),
   fClusterReader(NULL),
-  fgkOCDBEntry(""), 
-  fgkInputDataType()
+  fOCDBEntry(""), 
+  fInputDataType()
 {
   // see header file for class documentation
   // or
@@ -61,7 +62,6 @@ AliHLTTriggerCaloClusterEnergy::AliHLTTriggerCaloClusterEnergy(TString detector)
 
 }
 
-//const char* AliHLTTriggerCaloClusterEnergy::fgkOCDBEntry="HLT/ConfigHLT/CaloClusterEnergyTrigger";
 
 AliHLTTriggerCaloClusterEnergy::~AliHLTTriggerCaloClusterEnergy() {
   // see header file for class documentation
@@ -86,7 +86,7 @@ Int_t AliHLTTriggerCaloClusterEnergy::DoTrigger() {
   //Try the caloclusterstruct input
 
   
-  for (const AliHLTComponentBlockData* pBlock=GetFirstInputBlock(fgkInputDataType); pBlock!=NULL; pBlock=GetNextInputBlock()) {
+  for (const AliHLTComponentBlockData* pBlock=GetFirstInputBlock(fInputDataType); pBlock!=NULL; pBlock=GetNextInputBlock()) {
     AliHLTCaloClusterHeaderStruct *caloClusterHeader = reinterpret_cast<AliHLTCaloClusterHeaderStruct*>(pBlock->fPtr);
     fClusterReader->SetMemory(caloClusterHeader);
     
@@ -137,9 +137,12 @@ Bool_t AliHLTTriggerCaloClusterEnergy::TriggerOnCluster(T* cluster) {
     description.Form("Event contains at least one %s cluster with energy > %.02f GeV.", fDetector.Data(), fEThreshold);
     SetDescription(description.Data());
     
+
     // Enable the detectors for readout.
-    GetReadoutList().Enable( AliHLTReadoutList::kPHOS );
-    
+
+    //GetReadoutList().Enable(AliHLTReadoutList::kPHOS);
+    SetCaloReadoutList();  //FR
+        
     // Add the available HLT information for readout too.
     GetTriggerDomain().Add(kAliHLTAnyDataTypeID, fDetector.Data());
     
@@ -161,7 +164,7 @@ int AliHLTTriggerCaloClusterEnergy::DoInit(int argc, const char** argv) {
   // see header file for class documentation
 
   // first configure the default
-  int iResult=ConfigureFromCDBTObjString(fgkOCDBEntry);
+  int iResult=ConfigureFromCDBTObjString(fOCDBEntry);
 
   // configure from the command line parameters if specified
   if (iResult>=0 && argc>0) {
@@ -185,7 +188,7 @@ int AliHLTTriggerCaloClusterEnergy::Reconfigure(const char* cdbEntry, const char
 
   // configure from the specified antry or the default one
   const char* entry=cdbEntry;
-  if (!entry || entry[0]==0) entry=fgkOCDBEntry;
+  if (!entry || entry[0]==0) entry=fOCDBEntry;
 
   return ConfigureFromCDBTObjString(entry);
 }
@@ -209,7 +212,16 @@ int AliHLTTriggerCaloClusterEnergy::ScanConfigurationArgument(int argc, const ch
 }
 
 void AliHLTTriggerCaloClusterEnergy::GetOutputDataSize(unsigned long& constBase, double& inputMultiplier) {
-  // see header file for class documentation
+  // see header file for documentation
   constBase = sizeof(AliHLTTriggerDecision) + sizeof(AliHLTDomainEntry)*14;
   inputMultiplier = 1;
 }
+
+
+void AliHLTTriggerCaloClusterEnergy::GetOCDBObjectDescription( TMap* const targetMap) {
+  // Get a list of OCDB object description.
+  if (!targetMap) return;
+  targetMap->Add(new TObjString(fOCDBEntry),
+                new TObjString(Form("%s threshold trigger OCDB object", fDetector.Data()) ) 
+                );
+}