diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py b/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
index 7c4410791055a32ae006142348228287ca751045..a453a7574225ebb2b757f2d8f47b5028ccd4ba74 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/TestUtils.py
@@ -106,7 +106,7 @@ class L1DecoderTest(L1Decoder) :
SourceDecisions="L1MU",
Decisions="RerunL1MU"
) ]
- self.Chains = "HLTChainsResult"
+ self.L1DecoderSummaryKey = "L1DecoderSummary"
# L1 emulation for RDO
@@ -168,7 +168,7 @@ class L1EmulationTest(L1Decoder) :
'MU6 : HLT_mu8_e8']
self.roiUnpackers += [muUnpacker]
- self.Chains="HLTChainsResult"
+ self.L1DecoderSummaryKey = "L1DecoderSummary"
if __name__ == "__main__":
from AthenaCommon.Constants import DEBUG
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuL1DecodingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuL1DecodingTest.py
index 8c5ec84e8d21619bf73f153f3cfb24d571eaa56b..e53135f61537618e1868cbe9d1db8103da556cb8 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuL1DecodingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuL1DecodingTest.py
@@ -66,7 +66,7 @@ muUnpacker.ThresholdToChainMapping = ["MU6 : HLT_mu6", "MU6 : HLT_mu6idperf", "M
# do not know yet how to configure the services for it
l1Decoder.roiUnpackers = [emUnpacker]
-l1Decoder.Chains="HLTChainsResult"
+l1Decoder.L1DecoderSummaryKey = "L1DecoderSummary"
topSequence += l1Decoder
#Run calo decoder
@@ -76,7 +76,7 @@ emDecisionsDumper.Decisions = "EMRoIDecisions"
topSequence += emDecisionsDumper
chainSeedingDumper = DumpDecisions("ChainSeedingDumper", OutputLevel=DEBUG)
-chainSeedingDumper.Decisions = "HLTChainsResult"
+chainSeedingDumper.Decisions = "L1DecoderSummary"
topSequence += chainSeedingDumper
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
index 7fb58271d707592a7a8eb2ca9167f6daf8cf65bd..953a2d98bd7cadbbb0c6d7dec98c98957c2d7d0e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/EmuStepProcessingTest.py
@@ -157,7 +157,7 @@ from L1Decoder.L1DecoderConf import CTPUnpackingEmulationTool, RoIsUnpackingEmul
l1Decoder = L1Decoder( OutputLevel=DEBUG, RoIBResult="" )
l1Decoder.prescaler.EventInfo=""
l1Decoder.ChainToCTPMapping = EnabledChainNamesToCTP
-l1Decoder.Chains="HLTChainsResult"
+l1Decoder.L1DecoderSummaryKey = "L1DecoderSummary"
ctpUnpacker = CTPUnpackingEmulationTool( OutputLevel = DEBUG, ForceEnableAllChains=False , InputFilename="ctp.dat" )
l1Decoder.ctpUnpacker = ctpUnpacker
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/checkESD.py b/Trigger/TrigValidation/TrigUpgradeTest/share/checkESD.py
index 5f271c737b6cdb17e454cec258577a975a8ea7c5..2140a7487858b98f4e2d78cbbdb70047e7cfd5c7 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/checkESD.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/checkESD.py
@@ -10,13 +10,13 @@ checker.doDumpAll = False
checker.doDumpxAODTrigElectronContainer = False
checker.doDumpxAODTrackParticle = True
checker.doDumpTrigCompsiteNavigation = True
+checker.doDumpAllTrigComposite = True
checker.doDumpStoreGate = True
# this list was obtained by: checkxAOD.py myESD.pool.root | grep Composite | tr -s " "| cut -d" " -f10 | awk '{print "\""$1"\""}' | tr "\n" "," > f
-# Note that now there is also a flag to look at all of them at runtime. We may want to move to this in the future.
-tcContainers = [ "FilteredEMRoIDecisions", "L2CaloLinks", "L2ElectronLinks", "EgammaCaloDecisions", "FilteredEgammaCaloDecisions", "filterCaloRoIsAlg", "ElectronL2Decisions", "MuonL2Decisions", "METRoIDecisions", "MURoIDecisions", "HLTChainsResult", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "EMRoIDecisions" ]
-
-for container in tcContainers:
- checker.dumpTrigCompositeContainers += [ "remap_" + container ]
+# Note that this is superseded by checker.doDumpAllTrigComposite.
+# tcContainers = [ "FilteredEMRoIDecisions", "L2CaloLinks", "L2ElectronLinks", "EgammaCaloDecisions", "FilteredEgammaCaloDecisions", "filterCaloRoIsAlg", "ElectronL2Decisions", "MuonL2Decisions", "METRoIDecisions", "MURoIDecisions", "HLTChainsResult", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "EMRoIDecisions" ]
+# for container in tcContainers:
+# checker.dumpTrigCompositeContainers += [ "remap_" + container ]
from AthenaCommon.AppMgr import topSequence
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index 60e46f4f64b02cf1500ba260ad7d976d3ecf7868..5c586479d5fbe066b30bada0afebd2c97f3662fc 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -229,7 +229,7 @@ egammaEFCaloStep = stepSeq("egammaEFCalotep", filterL2ElectronRoIsAlg, [ efClust
from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
summaryStep0 = TriggerSummaryAlg( "TriggerSummaryStep1" )
-summaryStep0.InputDecision = "HLTChains"
+summaryStep0.InputDecision = "L1DecoderSummary"
summaryStep0.HLTSummary = "MonitoringSummaryStep1"
summaryStep0.FinalDecisions = [ caloHypoDecisions ]
summaryStep0.OutputLevel = DEBUG
@@ -245,12 +245,12 @@ egammaCaloStepRR = createFastCaloSequence( rerun=True )
step0r = parOR("step0r", [ egammaCaloStepRR ])
summary = TriggerSummaryAlg( "TriggerSummaryAlg" )
-summary.InputDecision = "HLTChains"
+summary.InputDecision = "L1DecoderSummary"
summary.FinalDecisions = [ "ElectronL2Decisions", "MuonL2Decisions" ]
from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
egammaViewsMerger = HLTEDMCreator("egammaViewsMerger")
-egammaViewsMerger.TrigCompositeContainer = [ "L2ElectronLinks", "filterCaloRoIsAlg", "EgammaCaloDecisions","ElectronL2Decisions", "MuonL2Decisions", "EMRoIDecisions", "METRoIDecisions", "MURoIDecisions", "HLTChainsResult", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "L2CaloLinks", "FilteredEMRoIDecisions", "FilteredEgammaCaloDecisions" ]
+egammaViewsMerger.TrigCompositeContainer = [ "L2ElectronLinks", "filterCaloRoIsAlg", "EgammaCaloDecisions","ElectronL2Decisions", "MuonL2Decisions", "EMRoIDecisions", "METRoIDecisions", "MURoIDecisions", "L1DecoderSummary", "JRoIDecisions", "MonitoringSummaryStep1", "RerunEMRoIDecisions", "RerunMURoIDecisions", "TAURoIDecisions", "L2CaloLinks", "FilteredEMRoIDecisions", "FilteredEgammaCaloDecisions" ]
egammaViewsMerger.TrackParticleContainerViews = [ l2ElectronViewsMaker.Views ]
egammaViewsMerger.TrackParticleContainerInViews = [ TrackParticlesName ]
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
index bbb34aa48762f09786816688b5f5cb38a8d2d36d..33c64a8bcf6b4818d110f272958e8db31444b447 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
@@ -324,7 +324,7 @@ if TriggerFlags.doMuon:
def summarySteps ( name, decisions ):
from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
summarySteps = TriggerSummaryAlg( "TriggerSummary"+name )
- summarySteps.InputDecision = "HLTChains"
+ summarySteps.InputDecision = "L1DecoderSummary"
summarySteps.HLTSummary = "MonitoringSummary"+name
summarySteps.OutputLevel = DEBUG
summarySteps.FinalDecisions = decisions
@@ -334,7 +334,7 @@ def summarySteps ( name, decisions ):
def muonViewsMergers( name ):
from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
muonViewsMerger = HLTEDMCreator("muonViewsMerger_" + name )
- muonViewsMerger.TrigCompositeContainer = [ "MURoIDecisions", "HLTChainsResult", "MonitoringSummaryStep1", "MonitoringSummaryStep2", "MonitoringSummaryStep3"]
+ muonViewsMerger.TrigCompositeContainer = [ "MURoIDecisions", "L1DecoderSummary", "MonitoringSummaryStep1", "MonitoringSummaryStep2", "MonitoringSummaryStep3"]
muonViewsMerger.OutputLevel = VERBOSE
if doL2SA==True:
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
index d2b7b25eb7af9c8158f3673e8f15a099f341d3f3..9c4f618c676b0f5a4169476b5e13f9db69038f50 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.withViews.py
@@ -121,7 +121,7 @@ egammaIDStep = stepSeq("egammaIDStep", filterCaloRoIsAlg, [ photonSequence ] )
from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
summaryStep0 = TriggerSummaryAlg( "TriggerSummaryStep1" )
-summaryStep0.InputDecision = "HLTChains"
+summaryStep0.InputDecision = "L1DecoderSummary"
summaryStep0.HLTSummary = "MonitoringSummaryStep1"
summaryStep0.FinalDecisions = [ caloHypoDecisions ]
summaryStep0.OutputLevel = DEBUG
@@ -136,11 +136,11 @@ egammaCaloStepRR = createFastCaloSequence( rerun=True )
step0r = parOR("step0r", [ egammaCaloStepRR ])
summary = TriggerSummaryAlg( "TriggerSummaryAlg" )
-summary.InputDecision = "HLTChains"
+summary.InputDecision = "L1DecoderSummary"
summary.FinalDecisions = [ "PhotonL2Decisions" ]
from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
edmCreator = HLTEDMCreator()
-edmCreator.TrigCompositeContainer = [ "EgammaCaloDecisions", "PhotonL2Decisions", "EMRoIDecisions", "HLTChainsResult" ]
+edmCreator.TrigCompositeContainer = [ "EgammaCaloDecisions", "PhotonL2Decisions", "EMRoIDecisions", "L1DecoderSummary" ]
egammaViewsMerger = HLTEDMCreator("egammaViewsMerger")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py b/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
index 4775d3ff7c97ef5a3e5f4c7dea6532a2529df2fa..b4839caddea94a3471fb4da9faa8da663252df3b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/simpleJetJob.py
@@ -85,7 +85,7 @@ if TriggerFlags.doCalo:
def summarySteps ( name, decisions ):
from DecisionHandling.DecisionHandlingConf import TriggerSummaryAlg
summarySteps = TriggerSummaryAlg( "TriggerSummary"+name )
- summarySteps.InputDecision = "HLTChains"
+ summarySteps.InputDecision = "L1DecoderSummary"
summarySteps.HLTSummary = "MonitoringSummary"+name
summarySteps.OutputLevel = DEBUG
summarySteps.FinalDecisions = decisions