reverting r47843: inconsistent mix committed by accident

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

diff --git a/HLT/trigger/AliHLTTriggerAgent.cxx b/HLT/trigger/AliHLTTriggerAgent.cxx
index afd3d050c6826c8cfc50eb729e3a991c61ed3f2d..75eba6338d36c82a7f60c279486a2c6fa1532a8b 100644 (file)
--- a/HLT/trigger/AliHLTTriggerAgent.cxx
+++ b/HLT/trigger/AliHLTTriggerAgent.cxx
@@ -50,6 +50,7 @@
 #include "AliHLTTriggerGammaConversion.h"
 #include "AliHLTMuonSpectroTriggerComponent.h"
 #include "AliHLTUpcTriggerComponent.h"
+#include "AliHLTTriggerCounterComponent.h"
 
 
 /** global instance for agent registration */
@@ -91,6 +92,7 @@ int AliHLTTriggerAgent::RegisterComponents(AliHLTComponentHandler* pHandler) con
   pHandler->AddComponent(new AliHLTTriggerGammaConversion);
   pHandler->AddComponent(new AliHLTMuonSpectroTriggerComponent);
   pHandler->AddComponent(new AliHLTUpcTriggerComponent);
+  pHandler->AddComponent(new AliHLTTriggerCounterComponent);
   return 0;
 }
 
@@ -190,16 +192,8 @@ int AliHLTTriggerAgent::CreateConfigurations(AliHLTConfigurationHandler* pHandle
   configurationId = "TRIGGER-D0";
   if(runloader && !rawReader){
     // simulation without simulated raw data
-    // use ESD as input and add in addition the MC information for trigger evaluation
+    // use ESD as input
     triggerInputs="GLOBAL-esd-converter ";
-
-    // 2010-09-13
-    // disable the publishing of MC information. It seems to be way too big for AA
-    // simulation, anyhow the evaluation of the trigger should be done outside the
-    // component    
-    // const char* mcpublisherId="TRIGGER-mc-publisher";
-    // pHandler->CreateConfiguration(mcpublisherId, "ESDMCEventPublisher", NULL, "-entrytype MC -datapath ./");
-    // triggerInputs+=mcpublisherId;
   }
   else{
     // simulation with simulated raw data, or raw data reconstruction