From c77b3dc7e4eb7e6c571828c984874471eb4e3157 Mon Sep 17 00:00:00 2001 From: aszostak Date: Thu, 21 Oct 2010 23:56:29 +0000 Subject: [PATCH] Updates for unit testing software triggers. --- HLT/trigger/test/TriggerConfig.C | 2 +- HLT/trigger/test/testGlobalTriggerComponent.C | 24 +++++++++++++++---- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/HLT/trigger/test/TriggerConfig.C b/HLT/trigger/test/TriggerConfig.C index 8fdec8058af..998cd238ab9 100644 --- a/HLT/trigger/test/TriggerConfig.C +++ b/HLT/trigger/test/TriggerConfig.C @@ -112,7 +112,7 @@ void SoftwareTriggersTestConfig() config.AddSymbol("domainSPD", "AliHLTTriggerDomain", "", "AliHLTTriggerDomain(\"*******:SPD\")"); config.AddItem(5, "START_OF_DATA", "START_OF_DATA", "Start of data"); config.AddItem(4, "END_OF_DATA", "END_OF_DATA", "End of data"); - config.AddItem(3, "SOFTWARE", "domainSPD", "Software trigger"); + config.AddItem(3, "SOFTWARE", "domainSPD | SOFTWARE", "Software trigger"); config.AddItem(2, "CALIBRATION", "domainPHOS", "Calibration trigger"); config.AddItem(1, "triggerMUON", "triggerMUON", "MUON trigger"); } diff --git a/HLT/trigger/test/testGlobalTriggerComponent.C b/HLT/trigger/test/testGlobalTriggerComponent.C index dfddbeec3a4..62dead9427d 100644 --- a/HLT/trigger/test/testGlobalTriggerComponent.C +++ b/HLT/trigger/test/testGlobalTriggerComponent.C @@ -308,11 +308,19 @@ void RunTriggerSW(int config = 0, bool usecint = false, bool debug = false, cons ); sys.Run( 1, // Number of events to process. - 1, // Stop chain at end of run. + 0, // Stop chain at end of run. 0x1, // Active CTP trigger mask. 0, // Time stamp. 0 // Event type. ); + sys.Run( + 1, // Number of events to process. + 1, // Stop chain at end of run. + 0x1, // Active CTP trigger mask. + 0, // Time stamp. + gkAliEventTypeSoftware, // Event type. + AliHLTReadoutList::kTPC + ); } /** @@ -828,9 +836,8 @@ bool CheckSoftwareTriggerTestConfig(const char* testName = "Software trigger con bool result = false; AliHLTTriggerDomain domainPHOS("*******:PHOS"); - domainPHOS.Remove(AliHLTReadoutList("PHOS")); AliHLTTriggerDomain domainSPD("*******:SPD"); - domainSPD.Remove(AliHLTReadoutList("ITSSPD")); + AliHLTTriggerDomain domainTPC("DAQRDOUT:TPC"); AliHLTTriggerDomain domainMUON("TRACKS:MUON"); domainMUON.Add(AliHLTReadoutList("MUONTRK MUONTRG")); @@ -867,12 +874,19 @@ bool CheckSoftwareTriggerTestConfig(const char* testName = "Software trigger con if (! result) goto cleanup; decision = dynamic_cast(file->Get("HLTGlobalTrigger;5")); - result = Check(testName, 5, decision, true, AliHLTTriggerDomain(), "End of data"); + result = Check(testName, 5, decision, true, domainSPD|domainTPC, "Software trigger"); if (! result) goto cleanup; - expectedCounters[1] = 1; expectedCounters[5] = 5; + expectedCounters[2] = 2; expectedCounters[5] = 5; result = CheckCounters(testName, 5, decision, expectedCounters); if (! result) goto cleanup; + decision = dynamic_cast(file->Get("HLTGlobalTrigger;6")); + result = Check(testName, 6, decision, true, AliHLTTriggerDomain(), "End of data"); + if (! result) goto cleanup; + expectedCounters[1] = 1; expectedCounters[5] = 6; + result = CheckCounters(testName, 6, decision, expectedCounters); + if (! result) goto cleanup; + delete file; return true; -- 2.43.5