diff --git a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
index cd3aad1eba229cad0b382b4c086e73bce713bdbd..fdcdb8307ae9e53b977708e7107b5f7d477ee211 100644
--- a/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
+++ b/Trigger/TrigSteer/DecisionHandling/src/InputMakerForRoI.cxx
@@ -27,7 +27,6 @@ StatusCode InputMakerForRoI::initialize() {
}
StatusCode InputMakerForRoI::finalize() {
- ATH_MSG_INFO( "Finalizing " << name() << "..." );
return StatusCode::SUCCESS;
}
@@ -37,7 +36,7 @@ StatusCode InputMakerForRoI::execute_r( const EventContext& context ) const {
// call base class helper method to read input decisions, loop over them create outputs and connect them, returns with outputHandles filled
std::vector< SG::WriteHandle<TrigCompositeUtils::DecisionContainer> > outputHandles;
- CHECK (decisionInputToOutput(context, outputHandles));
+ ATH_CHECK (decisionInputToOutput(context, outputHandles));
// Prepare Outputs
std::unique_ptr< TrigRoiDescriptorCollection > oneRoIColl( new TrigRoiDescriptorCollection() );
@@ -61,7 +60,7 @@ StatusCode InputMakerForRoI::execute_r( const EventContext& context ) const {
ElementLink<DecisionContainer> inputLink = linkToPrevious(outputDecision);
const Decision* inputDecision = *inputLink;
auto roiEL = inputDecision->objectLink<TrigRoiDescriptorCollection>(m_linkName.value() ); //"initialRoI"
- CHECK( roiEL.isValid() );
+ ATH_CHECK( roiEL.isValid() );
// avoid adding the same feature multiple times: check if not in container, if not add it
if ( find(RoIsFromDecision.begin(), RoIsFromDecision.end(), roiEL)
@@ -81,7 +80,7 @@ StatusCode InputMakerForRoI::execute_r( const EventContext& context ) const {
// Finally, record output
ATH_MSG_DEBUG("Produced "<<oneRoIColl->size() <<" output RoIs");
auto roi_outputHandle = SG::makeHandle(m_RoIs, context);
- CHECK( roi_outputHandle.record(std::move(oneRoIColl)) );
+ ATH_CHECK( roi_outputHandle.record(std::move(oneRoIColl)) );
// call base class helper method to print some debug messages summarising the content of the outputHandles.
CHECK( debugPrintOut(context, outputHandles) );
diff --git a/Trigger/TrigSteer/L1Decoder/test/test_l1decoder.sh b/Trigger/TrigSteer/L1Decoder/test/test_l1decoder.sh
index 8af560d6ee137f769a721c7f133f449058123800..bad6514e2009c2c7e2b28a8a3dd511316b84bc48 100755
--- a/Trigger/TrigSteer/L1Decoder/test/test_l1decoder.sh
+++ b/Trigger/TrigSteer/L1Decoder/test/test_l1decoder.sh
@@ -2,4 +2,4 @@
# art-type: build
# art-ci: master
-athena --threads=1 --skipEvents=10 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" L1Decoder/testL1Decoder.py
+athena --threads=1 --skipEvents=5 --evtMax=20 --filesInput="/cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/TrigP1Test/data17_13TeV.00327265.physics_EnhancedBias.merge.RAW._lb0100._SFO-1._0001.1" L1Decoder/testL1Decoder.py
diff --git a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
index 176ee0f287f76602aeadfe6e68ba2777c064d58b..3b711053060329083d86766d6f36db79b0e38a66 100644
--- a/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
+++ b/Trigger/TrigSteer/ViewAlgs/src/EventViewCreatorAlgorithm.h
@@ -48,7 +48,7 @@ class EventViewCreatorAlgorithm : public ::InputMakerBase
ServiceHandle< IScheduler > m_scheduler{ this, "Scheduler", "AvalancheSchedulerSvc", "The Athena scheduler" };
Gaudi::Property<bool> m_viewPerRoI{ this, "ViewPerRoI", false, "Create one View per RoI as opposed to one View per Decision object, needs to be true when multiple decisions per RoI exists" };
Gaudi::Property< std::string > m_viewNodeName{ this, "ViewNodeName", "", "Name of the CF node to attach a view to" };
- Gaudi::Property< std::string > m_roisLink{ this, "RoIsLink", "Unspecified", "Name of EL to RoI object lined to the decision" };
+ Gaudi::Property< std::string > m_roisLink{ this, "RoIsLink", "initialRoI", "Name of EL to RoI object lined to the decision" };
Gaudi::Property< bool > m_viewFallThrough { this, "ViewFallThrough", false, "Set whether views may accesas StoreGate directly to retrieve data" };
Gaudi::Property< bool > m_requireParentView { this, "RequireParentView", false, "Fail if the parent view can not be found" };
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
index 77a55f549b37bea0cf201671000c8b9afbc9ae07..64c49d0301353eb1d167add3e4a1ca12fbc3c731 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetMenuDefs.py
@@ -13,11 +13,7 @@ def jetSequence():
from DecisionHandling.DecisionHandlingConf import InputMakerForRoI
InputMakerAlg = InputMakerForRoI("JetInputMaker", OutputLevel = DEBUG, LinkName="initialRoI")
InputMakerAlg.RoIs='FSJETRoI'
- #from TrigUpgradeTest.TrigUpgradeTestConf import HLTTest__TestInputMaker
- #InputMakerAlg = HLTTest__TestInputMaker("JetInputMaker", OutputLevel = DEBUG, LinkName="initialRoI")
- #InputMakerAlg.Output='FSJETRoIs'
- #FSRoI
-
+
#reco sequence
from TrigUpgradeTest.jetDefs import jetRecoSequence
(recoSequence, sequenceOut) = jetRecoSequence(InputMakerAlg.RoIs)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
index dd409e4d5cd19d1daf48452b94bff06ac1de0268..bc444d4b249df89126738d518d9d7bafdbae7de7 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
@@ -31,14 +31,7 @@ if TriggerFlags.doCalo:
svcMgr += TrigCaloDataAccessSvc()
svcMgr.TrigCaloDataAccessSvc.OutputLevel=ERROR
- svcMgr.TrigCaloDataAccessSvc.MonTool = mon
-
-
-
- #topSequence += algo
- #from TrigUpgradeTest.TestUtils import L1DecoderTest
- #l1DecoderTest=L1DecoderTest()
- #topSequence+=l1DecoderTest
+ svcMgr.TrigCaloDataAccessSvc.MonTool = mon
from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
index 91d56a2d53a2d93ab07b72268c380ae253d8d97a..a12be6745095de66226afbc246b0c847ca0fba48 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
@@ -38,10 +38,6 @@ if globalflags.InputFormat.is_bytestream():
# this is a temporary hack to include new test chains
EnabledChainNamesToCTP = dict([ (c.name, c.seed) for c in testChains])
topSequence.L1DecoderTest.ChainToCTPMapping = EnabledChainNamesToCTP
-
-#EnabledElChains= [c.seed.strip().split("_")[1] +" : "+ c.name for c in testChains]
-#emUnpacker.ThresholdToChainMapping = EnabledElChains
-
topSequence.L1DecoderTest.prescaler.Prescales = ["HLT_e3_etcut:2", "HLT_2e3_etcut:2.5"]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.menu.py
index 40d8551fdf038f4aa7dbf8ec7c70be7065cee427..5885ffb5ce3061e8781fcc275fbeb92abe448dfd 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.menu.py
@@ -81,10 +81,7 @@ if TriggerFlags.doMuon==True:
# this is a temporary hack to include new test chains
EnabledChainNamesToCTP = dict([ (c.name, c.seed) for c in MenuChains])
topSequence.L1DecoderTest.ChainToCTPMapping = EnabledChainNamesToCTP
-
- #EnabledMuChains= [c.seed.strip().split("_")[1] +" : "+ c.name for c in MenuChains]
- #muUnpacker.ThresholdToChainMapping = EnabledMuChains
-
+
##########################################
# CF construction
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py b/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
index 18b247cbe5ee42577c7890fe96aa876db93a287c..856b55d284317a82b5f0a85a51810d53f7fbf7e6 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
@@ -27,7 +27,7 @@ if TriggerFlags.doCalo:
# menu items
- CTPToChainMapping = {"HLT_j85": "L1_J20" , "HLT_j100" : "L1_EM3" }
+ CTPToChainMapping = {"HLT_j85": "L1_J20" , "HLT_j100" : "L1_J20" }
testChains =[x for x, y in CTPToChainMapping.items()]
topSequence.L1DecoderTest.ChainToCTPMapping = CTPToChainMapping
print testChains
@@ -38,15 +38,10 @@ if TriggerFlags.doCalo:
L1JetDecisions=unpack.Decisions
- addFiltering=True
-
inputRoIs="FSRoI"
hypoDecisions=L1JetDecisions
- testEM=False
- if testEM:
- inputRoIs="StoreGateSvc+EMRoIs"
- hypoDecisions="L1EM"
+ addFiltering=True
if addFiltering:
#filter