From 1ee1ac03cf1b3a6c56fd99cafa59b7e63bcafaab Mon Sep 17 00:00:00 2001 From: aszostak Date: Sun, 12 Jun 2011 21:53:44 +0000 Subject: [PATCH] Getting rid of reference to AliHLTEventSummary and fixing global trigger test --- HLT/trigger/AliHLTMuonSpectroScalars.cxx | 2 +- HLT/trigger/AliHLTMuonSpectroScalars.h | 2 +- HLT/trigger/CreateTriggerMenuCDBEntry.C | 4 ---- HLT/trigger/menu/HM-PHYSICS-V0001.C | 3 --- HLT/trigger/test/TriggerConfig.C | 2 +- HLT/trigger/test/testGlobalTriggerComponent.C | 20 ++++++++++--------- 6 files changed, 14 insertions(+), 19 deletions(-) diff --git a/HLT/trigger/AliHLTMuonSpectroScalars.cxx b/HLT/trigger/AliHLTMuonSpectroScalars.cxx index 208625fbfe6..07a91bda777 100644 --- a/HLT/trigger/AliHLTMuonSpectroScalars.cxx +++ b/HLT/trigger/AliHLTMuonSpectroScalars.cxx @@ -21,7 +21,7 @@ /// @brief Implementation of the muon spectrometer trigger scalars. /// /// This implements the trigger scalars for the muon spectrometer that can be used -/// in the HLT global trigger and/or added to the AliHLTEventSummary. +/// in the HLT global trigger and/or added to the AliESDEvent. #include "AliHLTMuonSpectroScalars.h" #include "AliLog.h" diff --git a/HLT/trigger/AliHLTMuonSpectroScalars.h b/HLT/trigger/AliHLTMuonSpectroScalars.h index 2d7de1a7cd1..db19913eb65 100644 --- a/HLT/trigger/AliHLTMuonSpectroScalars.h +++ b/HLT/trigger/AliHLTMuonSpectroScalars.h @@ -22,7 +22,7 @@ * This scalars class contains summary information such as the number of tracks found, * number of pairs found and so on, all within the muon spectrometer. * Objects of this class are generated by the AliHLTMuonSpectroTriggerComponent to - * be used in the HLT global trigger and/or added to the AliHLTEventSummary object. + * be used in the HLT global trigger and/or added to the AliESDEvent object. * * \ingroup alihlt_trigger_components */ diff --git a/HLT/trigger/CreateTriggerMenuCDBEntry.C b/HLT/trigger/CreateTriggerMenuCDBEntry.C index 278aefb5450..1c922833175 100644 --- a/HLT/trigger/CreateTriggerMenuCDBEntry.C +++ b/HLT/trigger/CreateTriggerMenuCDBEntry.C @@ -81,10 +81,6 @@ void CreateTriggerMenuCDBEntry( // Create the trigger menu. AliHLTGlobalTriggerConfig config("Default Global Trigger Config"); - - //config.AddSymbol("triggerClasses", "AliHLTUInt64_t", "this->GetTriggerClasses()", "0x0", "AliHLTEventSummary"); - //config.AddItem("triggerClasses != 0x0", "domainAll", "CTP triggered"); - config.AddSymbol("domainAll", "AliHLTTriggerDomain", "", "AliHLTTriggerDomain(\"*******:***\")"); /////////////////////////////////////////////////////////////////////////////////////////// diff --git a/HLT/trigger/menu/HM-PHYSICS-V0001.C b/HLT/trigger/menu/HM-PHYSICS-V0001.C index c7ea6f8da62..28c99b0d60c 100644 --- a/HLT/trigger/menu/HM-PHYSICS-V0001.C +++ b/HLT/trigger/menu/HM-PHYSICS-V0001.C @@ -82,9 +82,6 @@ void HM_PHYSICS_V0001( // Create the trigger menu. AliHLTGlobalTriggerConfig config("HM-COSMICS-V0001"); - //config.AddSymbol("triggerClasses", "AliHLTUInt64_t", "this->GetTriggerClasses()", "0x0", "AliHLTEventSummary"); - //config.AddItem("triggerClasses != 0x0", "domainAll", "CTP triggered"); - config.AddSymbol("domainAll", "AliHLTTriggerDomain", "", "AliHLTTriggerDomain(\"*******:***\")"); // ///////////////////////////////////////////////////////////////////////////////////////// diff --git a/HLT/trigger/test/TriggerConfig.C b/HLT/trigger/test/TriggerConfig.C index 998cd238ab9..02cf98b76ed 100644 --- a/HLT/trigger/test/TriggerConfig.C +++ b/HLT/trigger/test/TriggerConfig.C @@ -76,7 +76,7 @@ void SymbolTestConfig() config.AddSymbol("PHOStracks", "AliHLTTriggerDomain", "", "AliHLTTriggerDomain(\"TRACKS:PHOS\")"); config.AddSymbol("domainPHOS", "AliHLTTriggerDomain", "", "PHOSclusters | PHOStracks"); config.AddSymbol("triggerTPC", "bool", "this->Result()", "false", "AliHLTTriggerDecision"); - config.AddSymbol("trigClasses", "AliHLTUInt64_t", "this->GetTriggerClasses()", "0x0", "AliHLTEventSummary"); + config.AddSymbol("trigClasses", "Double_t", "this->GetScalar(\"TrigClass\")", "0", "AliHLTScalars"); config.AddItem(2, "true", "domain-All", 4, "Pass through"); config.AddItem(1, "trigClasses == 0x2", "triggerTPC | domainPHOS", "Trigger class 2"); } diff --git a/HLT/trigger/test/testGlobalTriggerComponent.C b/HLT/trigger/test/testGlobalTriggerComponent.C index 62dead9427d..9f10dac9c44 100644 --- a/HLT/trigger/test/testGlobalTriggerComponent.C +++ b/HLT/trigger/test/testGlobalTriggerComponent.C @@ -51,7 +51,7 @@ #include "AliHLTTriggerDomain.h" #include "AliHLTTriggerDecision.h" #include "AliHLTGlobalTriggerDecision.h" -#include "AliHLTEventSummary.h" +#include "AliHLTScalars.h" #include "AliHLTSystem.h" #include "AliHLTConfiguration.h" #include "Riostream.h" @@ -94,11 +94,11 @@ void GenerateInputData() triggerDomain3.Add(readoutList3); AliHLTTriggerDecision decision3(true, "triggerSSD", triggerDomain3, "SSD has data"); - AliHLTEventSummary summary1; - summary1.SetTriggerClass(0x1); + AliHLTScalars summary1; + summary1.GetScalar("TrigClass").Value(0x1); - AliHLTEventSummary summary2; - summary2.SetTriggerClass(0x2); + AliHLTScalars summary2; + summary2.GetScalar("TrigClass").Value(0x2); TFile* file = new TFile("testInputFile1.root", "RECREATE"); decision1.Write("triggerTPC"); @@ -143,6 +143,7 @@ void GenerateInputData() file = new TFile("testInputFile8.root", "RECREATE"); delete file; + /*FIXME This has stopped working in AliRoot, it causes a segfault now within the AliHLTReadoutList vtable. if (loadedLibs) { gSystem->Unload("libAliHLTTrigger.so"); @@ -150,6 +151,7 @@ void GenerateInputData() gSystem->Unload("libAliHLTTRD.so"); gSystem->Unload("libAliHLTUtil.so"); } + */ } /** @@ -189,7 +191,7 @@ void RunTrigger(int config = 0, bool usecint = false, bool debug = false, int nu cmdline = Form("-config $ALICE_ROOT/HLT/trigger/test/TriggerConfig.C(%d)" " -includepath $ALICE_ROOT/include -includepath $ALICE_ROOT/HLT/BASE" - " -includepath $ALICE_ROOT/HLT/trigger -include AliHLTEventSummary.h", + " -includepath $ALICE_ROOT/HLT/trigger -include AliHLTScalars.h", config ); if (customClass != NULL) cmdline += Form(" -usecode %s.cxx %s", customClass, customClass); @@ -280,7 +282,7 @@ void RunTriggerSW(int config = 0, bool usecint = false, bool debug = false, cons cmdline = Form("-config $ALICE_ROOT/HLT/trigger/test/TriggerConfig.C(%d)" " -includepath $ALICE_ROOT/include -includepath $ALICE_ROOT/HLT/BASE" - " -includepath $ALICE_ROOT/HLT/trigger -include AliHLTEventSummary.h" + " -includepath $ALICE_ROOT/HLT/trigger -include AliHLTScalars.h" " -process-all-events", config ); @@ -625,7 +627,7 @@ bool CheckSymbolTestConfig(const char* testName = "Symbol config") TFile* file = new TFile("testOutputFile.root", "READ"); - // Triggers in events (i.e. input triggers) and trigger classes in AliHLTEventSummary: + // Triggers in events (i.e. input triggers) and trigger classes in AliHLTScalars: // event 1: TPC MUON SSD, 0x2 // event 2: TPC , 0x2 // event 3: MUON , 0x1 @@ -691,7 +693,7 @@ bool CheckComplexTestConfig(const char* testName = "Complex config") TFile* file = new TFile("testOutputFile.root", "READ"); - // Triggers in events (i.e. input triggers) and trigger classes in AliHLTEventSummary: + // Triggers in events (i.e. input triggers) and trigger classes in AliHLTScalars: // event 1: TPC MUON SSD, 0x2 // event 2: TPC , 0x2 // event 3: MUON , 0x1 -- 2.39.3