From fe372d42e99cd3dc51ae8a847e6be313be23f7dc Mon Sep 17 00:00:00 2001
From: Francesca Pastore <francesca.pastore@cern.ch>
Date: Thu, 13 Sep 2018 18:10:14 +0200
Subject: [PATCH] cleanup of L1Decoding chains
---
.../TrigUpgradeTest/python/HLTCFConfig.py | 6 +++---
.../TrigUpgradeTest/share/egamma.withViews.py | 16 +++++++++++++---
.../TrigUpgradeTest/share/mu.withViews.py | 9 ++++++++-
3 files changed, 24 insertions(+), 7 deletions(-)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTCFConfig.py b/Trigger/TrigValidation/TrigUpgradeTest/python/HLTCFConfig.py
index 9f80ae8b1ef..d5fe9fb9ca5 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/HLTCFConfig.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/HLTCFConfig.py
@@ -169,11 +169,11 @@ def makeHLTTree(HLTChains):
summary= makeSummary("TriggerSummaryFinal", flatDecisions)
#from TrigOutputHandling.TrigOutputHandlingConf import HLTEDMCreator
#edmCreator = HLTEDMCreator()
- #
+
#edmCreator.TrigCompositeContainer = flatDecisions
#summary.OutputTools= [ edmCreator ]
- #hltTop += summary
- #hltTop += makeMonitor("TriggerMonitorFinal", finalDecisions, EnabledChainNames)
+ hltTop += summary
+ hltTop += makeMonitor("TriggerMonitorFinal", finalDecisions, EnabledChainNames)
#hltTop += makeStreamESD("StreamESD", flatDecisions)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
index d88312ec05a..691de216d9b 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/egamma.withViews.py
@@ -4,7 +4,6 @@
include("TrigUpgradeTest/testHLT_MT.py")
-
from InDetRecExample.InDetJobProperties import InDetFlags
InDetFlags.doCaloSeededBrem = False
@@ -33,9 +32,19 @@ from InDetRecExample.InDetKeys import InDetKeys
if globalflags.InputFormat.is_bytestream():
topSequence.L1DecoderTest.ctpUnpacker.OutputLevel=DEBUG
topSequence.L1DecoderTest.roiUnpackers[0].OutputLevel=DEBUG
-testChains = ["HLT_e3_etcut", "HLT_e5_etcut", "HLT_e7_etcut", "HLT_2e3_etcut", "HLT_e3e5_etcut"]
+
+CTPToChainMapping = {"HLT_e3_etcut": "L1_EM3",
+ "HLT_e5_etcut": "L1_EM3",
+ "HLT_e7_etcut": "L1_EM7",
+ "HLT_2e3_etcut": "L1_2EM3",
+ "HLT_e3e5_etcut":"L1_2EM3"}
+
topSequence.L1DecoderTest.prescaler.Prescales = ["HLT_e3_etcut:2", "HLT_2e3_etcut:2.5"]
+# this is a temporary hack to include only new test chains
+testChains =[x for x, y in CTPToChainMapping.items()]
+topSequence.L1DecoderTest.ChainToCTPMapping = CTPToChainMapping
+
@@ -246,7 +255,8 @@ from TrigSteerMonitor.TrigSteerMonitorConf import TrigSignatureMoniMT, DecisionC
mon = TrigSignatureMoniMT()
mon.FinalDecisions = [ "ElectronL2Decisions", "MuonL2Decisions", "WhateverElse" ]
from TrigUpgradeTest.TestUtils import MenuTest
-mon.ChainsList = list( set( MenuTest.CTPToChainMapping.keys() ) )
+mon.ChainsList = list( set( topSequence.L1DecoderTest.ChainToCTPMapping.keys() ) )
+#mon.ChainsList = list( set( MenuTest.CTPToChainMapping.keys() ) )
mon.OutputLevel = DEBUG
step1Collector = DecisionCollectorTool("Step1Collector")
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
index af589dd02da..6deaf975a71 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/mu.withViews.py
@@ -75,7 +75,14 @@ from AthenaCommon.CfgGetter import getPublicTool, getPublicToolClone
from AthenaCommon import CfgMgr
### muon thresholds ###
-testChains = ["HLT_mu6", "HLT_2mu6"]
+CTPToChainMapping = {"HLT_mu6": "L1_MU6",
+ "HLT_2mu6": "L1_2MU4" }
+
+# this is a temporary hack to include only new test chains
+testChains =[x for x, y in CTPToChainMapping.items()]
+topSequence.L1DecoderTest.ChainToCTPMapping = CTPToChainMapping
+
+
# ===============================================================================================
--
GitLab