Updates required to generate trigger decision bit properly.

diff --git a/HLT/trigger/menu/HM-PHYSICS-V0002.C b/HLT/trigger/menu/HM-PHYSICS-V0002.C
index 0c16be292e9b89f0796adb236c09794cbbd1a522..3e618a4e8742f8528f5ae0515aa962560b9dd86b 100644 (file)
--- a/HLT/trigger/menu/HM-PHYSICS-V0002.C
+++ b/HLT/trigger/menu/HM-PHYSICS-V0002.C
@@ -30,6 +30,7 @@
 #include "AliCDBStorage.h"
 #include "AliCDBEntry.h"
 #include "AliHLTTriggerMenu.h"
+#include "AliHLTReadoutList.h"
 #include "AliHLTGlobalTriggerConfig.h"
 #include "TObjString.h"
 #include "TString.h"
@@ -133,8 +134,8 @@ void HM_PHYSICS_V0002(
                 4, // priority group.
                 "CINT1WU-B-NOPF-ALL || CINT1-B-NOPF-ALLNOTRD",
                 "domainHLTOUT | domainALLDDL",
-                7,  // scaledown factor 1/7
-                "H-MINBIAS_SCALE_DOWN-V0003.001-CENTRAL-ALL"
+                "H-MINBIAS_SCALE_DOWN-V0003.001-CENTRAL-ALL",
+                15.  // scaledown factor 0.15
                 );
 
   // Readout only 50% of HLT ESDs for min bias.
@@ -143,7 +144,8 @@ void HM_PHYSICS_V0002(
                 "CINT1WU-B-NOPF-ALL || CINT1-B-NOPF-ALLNOTRD",
                 "domainESD | domainHLTDDL",
                 2,  // scaledown factor 1/2
-                "Rejected min-bias with HLT ESD readout"
+                "Rejected min-bias with HLT ESD readout",
+                false  // default global trigger decision result
                 );
 
   // Reject completely the other 50% min bias.
@@ -151,13 +153,16 @@ void HM_PHYSICS_V0002(
                 2, // priority group.
                 "CINT1WU-B-NOPF-ALL || CINT1-B-NOPF-ALLNOTRD",
                 "domainHLTDDL",  // Only HLT DDL to deliver at least the decision.
-                "Rejected min-bias"
+                0,  // No prescalar (no scaledown)
+                "Rejected min-bias",
+                false  // default global trigger decision result
                 );
 
   config.AddItem(
                 1, // priority group.
                 "SOFTWARE || CALIBRATION || START_OF_DATA || END_OF_DATA",
-                "domainHLTOUT | domainALLDDL",
+                //"domainHLTOUT | domainALLDDL",
+                "SOFTWARE | CALIBRATION | START_OF_DATA | END_OF_DATA",
                 "H-SoftwareTrigger-V0001.001-ALL-ALL"
                 );
 
@@ -170,8 +175,9 @@ void HM_PHYSICS_V0002(
   readoutlist.Enable(AliHLTReadoutList::kALLDET);
   defaultDomain.Add(readoutlist);
   config.SetDefaultTriggerDomain(defaultDomain);
+  config.SetDefaultResult(true);
   
-  TObject* menu = AliHLTGlobalTriggerConfig::Menu();
+  TObject* menu = AliHLTGlobalTriggerConfig::Menu()->Clone();
   menu->Print();
   
   ///////////////////////////////////////////////////////////////////////////////////////////

diff --git a/HLT/trigger/menu/HM-TEST-V0001.C b/HLT/trigger/menu/HM-TEST-V0001.C
index 392b8baafa2353254655f98c02d3ceb88f9bc1d7..fbcabb34a8000c3b7b288748bf12288d88358ebb 100644 (file)
--- a/HLT/trigger/menu/HM-TEST-V0001.C
+++ b/HLT/trigger/menu/HM-TEST-V0001.C
@@ -22,6 +22,7 @@
 #include "AliCDBStorage.h"
 #include "AliCDBEntry.h"
 #include "AliHLTTriggerMenu.h"
+#include "AliHLTReadoutList.h"
 #include "AliHLTGlobalTriggerConfig.h"
 #include "TObjString.h"
 #include "TString.h"
@@ -256,7 +257,8 @@ void HM_TEST_V0001(
                 "CINT1WU-B-NOPF-ALL || CINT1-B-NOPF-ALLNOTRD",
                 "domainESD | domainHLTDDL",
                 2,  // scaledown factor 1/2
-                "Rejected min-bias with HLT ESD readout"
+                "Rejected min-bias with HLT ESD readout",
+                false  // default global trigger decision result
                 );
 
   // Reject completely the other 50% min bias.
@@ -264,7 +266,9 @@ void HM_TEST_V0001(
                 10, // priority group.
                 "CINT1WU-B-NOPF-ALL || CINT1-B-NOPF-ALLNOTRD",
                 "domainHLTDDL",  // Only HLT DDL to deliver at least the decision.
-                "Rejected min-bias"
+                0,  // no scaledown
+                "Rejected min-bias",
+                false  // default global trigger decision result
                 );
 
   config.AddItem(
@@ -284,8 +288,9 @@ void HM_TEST_V0001(
   readoutlist.Enable(AliHLTReadoutList::kALLDET);
   defaultDomain.Add(readoutlist);
   config.SetDefaultTriggerDomain(defaultDomain);
+  config.SetDefaultResult(true);
   
-  TObject* menu = AliHLTGlobalTriggerConfig::Menu();
+  TObject* menu = AliHLTGlobalTriggerConfig::Menu()->Clone();
   menu->Print();
   
   ///////////////////////////////////////////////////////////////////////////////////////////