added virtual method in CALO to set the readout list individally in the derived class...

diff --git a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
index c92072e8c12cca62e5245cbe250c405bd4ea8432..48e6f2d6e1bb0bcc82747ab2cb44f90c26a26a38 100644 (file)
--- a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
+++ b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.cxx
@@ -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());
     

diff --git a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h
index aa497f32daa84921d0d384d4ece80aa41d9226b4..7c22b0ea929653cf6cd23da84e9ffcd7ad5760a2 100644 (file)
--- a/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h
+++ b/HLT/trigger/AliHLTTriggerCaloClusterEnergy.h
@@ -100,6 +100,9 @@ protected :
   ///Get the clusters from the esd
   virtual Int_t GetClustersFromEsd( const AliESDEvent * esd, TRefArray * clustersRefs ) = 0;
 
+  // FR: Set the appropriate readout list for each calo
+  virtual void SetCaloReadoutList() = 0;
+  
   /// inherited from AliHLTTrigger: calculate the trigger
   Int_t DoTrigger();
 

diff --git a/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx b/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx
index d7b922b8890b4e37f9d9540cf6aa30e75eeeb005..923855f2ddf0c043f3594f719aa9bcc2c5a5956d 100644 (file)
--- a/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx
+++ b/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.cxx
@@ -68,3 +68,8 @@ AliHLTComponent* AliHLTTriggerEmcalClusterEnergy::Spawn() {
 Int_t AliHLTTriggerEmcalClusterEnergy::GetClustersFromEsd( const AliESDEvent * esd, TRefArray * clustersRefs ){
   return esd->GetEMCALClusters(clustersRefs);
 }
+
+// FR
+void AliHLTTriggerEmcalClusterEnergy::SetCaloReadoutList() {
+  GetReadoutList().Enable(AliHLTReadoutList::kEMCAL);
+}

diff --git a/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.h b/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.h
index a4c69c1e68b05ffa11b30aa19a92e657f1f629b3..9cf3b92bfcbca85603cbc7d9703ba2ff49845783 100644 (file)
--- a/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.h
+++ b/HLT/trigger/AliHLTTriggerEmcalClusterEnergy.h
@@ -69,6 +69,10 @@ public:
   AliHLTComponent* Spawn();
 
 
+protected:
+  // FR
+  void SetCaloReadoutList();
+
 private:
 
   ///Inherited from AliHLTTriggerCaloClusterEnergy, get the correct set of ESD calo clusters

diff --git a/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx b/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx
index eef0bd019a28f609053aa90b875588a3c697a041..9b6849f331d0c325dea18bbc983f253644f7bb96 100644 (file)
--- a/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx
+++ b/HLT/trigger/AliHLTTriggerPhosClusterEnergy.cxx
@@ -68,3 +68,8 @@ AliHLTComponent* AliHLTTriggerPhosClusterEnergy::Spawn() {
 Int_t AliHLTTriggerPhosClusterEnergy::GetClustersFromEsd( const AliESDEvent * esd, TRefArray * clustersRefs ){
   return esd->GetPHOSClusters(clustersRefs);
 }
+
+// FR
+void AliHLTTriggerPhosClusterEnergy::SetCaloReadoutList() {
+  GetReadoutList().Enable(AliHLTReadoutList::kPHOS);
+}

diff --git a/HLT/trigger/AliHLTTriggerPhosClusterEnergy.h b/HLT/trigger/AliHLTTriggerPhosClusterEnergy.h
index 03aa63a1fde9096df464c6ed3b9239a5434b9ab7..89018d547d34fd0949a4e6c3d07f399f1e6234c5 100644 (file)
--- a/HLT/trigger/AliHLTTriggerPhosClusterEnergy.h
+++ b/HLT/trigger/AliHLTTriggerPhosClusterEnergy.h
@@ -68,6 +68,9 @@ public:
   /// inherited from AliHLTComponent: create an instance
   AliHLTComponent* Spawn();
 
+protected:
+  // FR
+  void SetCaloReadoutList();
 
 private: