temporarily reverting part of r36598

the output data type of the (global) trigger decision had been changed to the
specific data type kAliHLTDataTypeGlobalTrigger and kAliHLTDataTypeTrigger.
This needs some changes in the handlers first which needs to be ported to the
release in order to be active for Grid reconstruction. Will hopefully be done
within the next few days.

diff --git a/HLT/trigger/AliHLTGlobalTriggerComponent.cxx b/HLT/trigger/AliHLTGlobalTriggerComponent.cxx
index 7902bc55429e9d74fdecd496f9f32f2d054af915..b745eae1e4bb3777cc86a3b77a1077e1b65d5173 100644 (file)
--- a/HLT/trigger/AliHLTGlobalTriggerComponent.cxx
+++ b/HLT/trigger/AliHLTGlobalTriggerComponent.cxx
@@ -411,7 +411,7 @@ int AliHLTGlobalTriggerComponent::DoTrigger()
 
   CreateEventDoneReadoutFilter(decision.TriggerDomain(), 3);
   CreateEventDoneReadoutFilter(decision.TriggerDomain(), 4);
-  if (TriggerEvent(&decision, kAliHLTDataTypeGlobalTrigger) == -ENOSPC)
+  if (TriggerEvent(&decision) == -ENOSPC)
   {
     // Increase the estimated buffer space required if the PushBack methods in TriggerEvent
     // returned the "no buffer space" error code. Also remember to set the trigger counters

diff --git a/HLT/trigger/AliHLTTrigger.cxx b/HLT/trigger/AliHLTTrigger.cxx
index 6f0273ccbfba6ac3b2dc0e02bdc8f58ae9dac77d..920b8fab945b6c00de5a3176dd2b3f452b933840 100644 (file)
--- a/HLT/trigger/AliHLTTrigger.cxx
+++ b/HLT/trigger/AliHLTTrigger.cxx
@@ -123,7 +123,7 @@ int AliHLTTrigger::TriggerEvent(bool value)
   AliHLTTriggerDecision triggerResult(value, GetTriggerName(), fTriggerDomain, fDescription);
   // Append the readout list if it contains anything.
   triggerResult.TriggerDomain().Add(fReadoutList);
-  return TriggerEvent(&triggerResult, kAliHLTDataTypeTriggerDecision);
+  return TriggerEvent(&triggerResult, kAliHLTDataTypeTObject|kAliHLTDataOriginOut);
 }