diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index ef8fdaf839152335aa51b20163244066ec161406..230638ee652eebd8a2a027fd38d8d88277036fef 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
@@ -1,9 +1,8 @@
from AthenaCommon.Constants import ERROR, DEBUG
-from AthenaCommon.CFElements import seqAND
+from AthenaCommon.CFElements import seqAND, parOR
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
def setMinimalCaloSetup() :
-
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
if not hasattr(svcMgr,'TrigCaloDataAccessSvc'):
from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc
@@ -11,6 +10,10 @@ def setMinimalCaloSetup() :
svcMgr.TrigCaloDataAccessSvc.OutputLevel=ERROR
+########################
+## ALGORITHMS
+########################
+
def algoHLTCaloCell(inputEDM='FSRoI', outputEDM='CellsClusters', RoIMode=True, OutputLevel=ERROR) :
setMinimalCaloSetup();
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
@@ -38,6 +41,10 @@ def algoL2Egamma(inputEDM="EMRoIs",OutputLevel=ERROR):
return algo
+####################################
+##### SEQUENCES
+####################################
+
def fastCaloRecoSequence(InViewRoIs):
from TrigT2CaloCommon.CaloDef import algoL2Egamma
fastCaloAlg = algoL2Egamma(OutputLevel=DEBUG,inputEDM=InViewRoIs)
@@ -47,7 +54,6 @@ def fastCaloRecoSequence(InViewRoIs):
def fastCaloEVCreator():
-
InViewRoIs="EMCaloRoIs"
fastCaloViewsMaker = EventViewCreatorAlgorithm( "fastCaloViewsMaker", OutputLevel=DEBUG)
fastCaloViewsMaker.ViewFallThrough = True
@@ -56,11 +62,11 @@ def fastCaloEVCreator():
fastCaloViewsMaker.Views = "EMCaloViews"
fastCaloViewsMaker.ViewNodeName = "fastCaloInViewSequence"
return (fastCaloViewsMaker, InViewRoIs)
-
-def createFastCaloSequence(EMRoIDecisions):
+
+def createFastCaloSequence(EMRoIDecisions):
(fastCaloViewsMaker, InViewRoIs) = fastCaloEVCreator()
- # connect
+ # connect to RoIs
fastCaloViewsMaker.InputMakerInputDecisions = [ EMRoIDecisions ]
fastCaloViewsMaker.InputMakerOutputDecisions = [ EMRoIDecisions + "IMOUTPUT"]
@@ -71,3 +77,13 @@ def createFastCaloSequence(EMRoIDecisions):
+def HLTCaloCellRecoSequence(RoIs):
+ CellsClusters = 'CellsClusters'
+ algo1= algoHLTCaloCell(RoIs, outputEDM=CellsClusters, RoIMode=True, OutputLevel=DEBUG)
+ algo2= algoHLTTopoCluster(inputEDM=CellsClusters, OutputLevel=DEBUG)
+ RecoSequence = parOR("ClusterRecoSequence", [algo1, algo2])
+ print algo2
+ for tool in algo2.ClusterMakerTools:
+ print tool
+
+ return RecoSequence
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
index d4c628d9a8e2961adb11e379cdc7635b31899212..a53c608660cb28e5f3c923e1ceb6573042cfa141 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/CaloMenuDefs.py
@@ -25,13 +25,15 @@ def fastCaloSequence(ConfigFlags):
return (fastCaloSequence, fastCaloViewsMaker, sequenceOut)
-def fastCaloMenuSequence():
- """ Creates L2 Fast Calo MENU sequence"""
+def fastCaloMenuSequence(name):
+ """ Creates L2 Fast Calo MENU sequence
+ The Hypo name changes depending on name, so for different implementations (Electron, Gamma,....)
+ """
(sequence, fastCaloViewsMaker, sequenceOut) = RecoFragmentsPool.retrieve(fastCaloSequence, ConfigFlags)
# hypo
from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2CaloHypoAlgMT
- theFastCaloHypo = TrigL2CaloHypoAlgMT("L2CaloHypo", OutputLevel = DEBUG)
+ theFastCaloHypo = TrigL2CaloHypoAlgMT(name+"L2CaloHypo", OutputLevel = DEBUG)
theFastCaloHypo.CaloClusters = sequenceOut
CaloMenuDefs.L2CaloClusters = sequenceOut
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
index 97186c5115b40528343fba4754b41f49094e45ff..30d223d857adc3c3a59d4b8bc3ccfb0b0442fd3a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/electronMenuDefs.py
@@ -99,6 +99,7 @@ def electronMenuSequence():
from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2ElectronHypoAlgMT
theElectronHypo = TrigL2ElectronHypoAlgMT()
theElectronHypo.Electrons = sequenceOut
+
theElectronHypo.RunInView=True
theElectronHypo.OutputLevel = VERBOSE
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
index 8b465c1e96cd3b154a3f374e4fc950ed69e0d32a..4cb74c33fcbc1089d40a475ef172a5c09ca99631 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
@@ -9,66 +9,78 @@ def jetRecoSequence(RoIs):
from AthenaCommon.Constants import VERBOSE,DEBUG,INFO
from AthenaCommon.CFElements import parOR, seqAND, seqOR, stepSeq
- #jetRecoSequence = seqAND("jetRecoSequence")
- jetRecoSequence = parOR("jetRecoSequence")
-
-
-
- # jets reco
- from AthenaMonitoring.GenericMonitoringTool import (GenericMonitoringTool,
- defineHistogram)
-
- from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc
- import math
- mon = GenericMonitoringTool("CaloDataAccessSvcMon")
- mon.Histograms += [
- defineHistogram("TIME_locking_LAr_RoI",
- path="EXPERT",
- title="Time spent in unlocking the LAr collection",
- xbins=100, xmin=0, xmax=100 ),
- defineHistogram("roiROBs_LAr",
- path="EXPERT",
- title="Number of ROBs unpacked in RoI requests",
- xbins=20, xmin=0, xmax=20 ),
- defineHistogram("TIME_locking_LAr_FullDet",
- path="EXPERT",
- title="Time spent in unlocking the LAr collection",
- xbins=100, xmin=0, xmax=100 ),
- defineHistogram("roiEta_LAr,roiPhi_LAr",
- type="TH2F",
- path="EXPERT",
- title="Geometric usage",
- xbins=50, xmin=-5, xmax=5,
- ybins=64, ymin=-math.pi, ymax=math.pi )]
-
- svcMgr += TrigCaloDataAccessSvc()
- svcMgr.TrigCaloDataAccessSvc.OutputLevel=INFO
- svcMgr.TrigCaloDataAccessSvc.MonTool = mon
+
+
+
+ # calo Cluster reco
+
+ if False:
+ from AthenaMonitoring.GenericMonitoringTool import (GenericMonitoringTool,
+ defineHistogram)
+
+ from TrigT2CaloCommon.TrigT2CaloCommonConf import TrigCaloDataAccessSvc
+ import math
+ mon = GenericMonitoringTool("CaloDataAccessSvcMon")
+ mon.Histograms += [
+ defineHistogram("TIME_locking_LAr_RoI",
+ path="EXPERT",
+ title="Time spent in unlocking the LAr collection",
+ xbins=100, xmin=0, xmax=100 ),
+ defineHistogram("roiROBs_LAr",
+ path="EXPERT",
+ title="Number of ROBs unpacked in RoI requests",
+ xbins=20, xmin=0, xmax=20 ),
+ defineHistogram("TIME_locking_LAr_FullDet",
+ path="EXPERT",
+ title="Time spent in unlocking the LAr collection",
+ xbins=100, xmin=0, xmax=100 ),
+ defineHistogram("roiEta_LAr,roiPhi_LAr",
+ type="TH2F",
+ path="EXPERT",
+ title="Geometric usage",
+ xbins=50, xmin=-5, xmax=5,
+ ybins=64, ymin=-math.pi, ymax=math.pi )]
+
+ #jetRecoSequence = seqAND("jetRecoSequence")
+ jetRecoSequence = parOR("jetRecoSequence")
+
+ svcMgr += TrigCaloDataAccessSvc()
+ svcMgr.TrigCaloDataAccessSvc.OutputLevel=INFO
+ svcMgr.TrigCaloDataAccessSvc.MonTool = mon
+
+ from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
+ from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
+ algo1=HLTCaloCellMaker("HLTCaloCellMaker")
+ algo1.RoIs=RoIs
+ # algo1.RoIs="StoreGateSvc+FSJETRoIs"
+ algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
+ algo1.roiMode = True
+ algo1.CellsName="CellsClusters"
+ # algo1.OutputLevel=VERBOSE
+ jetRecoSequence += algo1
+
+
+
+ from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
+ algo2 = TrigCaloClusterMakerMT_topo(doMoments=True, doLC=False, cells="CellsClusters")
+ # algo2.Cells = "CellsClusters"
+ # algo2.OutputLevel = VERBOSE
+ jetRecoSequence += algo2
+ print algo2
+ for tool in algo2.ClusterMakerTools:
+ print tool
+
+
+ else:
+ from TrigT2CaloCommon.CaloDef import HLTCaloCellRecoSequence
+ jetRecoSequence = HLTCaloCellRecoSequence(RoIs)
+
+
- from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
- from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
- algo1=HLTCaloCellMaker("HLTCaloCellMaker")
- algo1.RoIs=RoIs
- # algo1.RoIs="StoreGateSvc+FSJETRoIs"
- algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
- algo1.roiMode = True
- algo1.CellsName="CellsClusters"
-# algo1.OutputLevel=VERBOSE
- jetRecoSequence += algo1
-
-
-
- from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
- algo2 = TrigCaloClusterMakerMT_topo(doMoments=True, doLC=False, cells="CellsClusters")
-# algo2.Cells = "CellsClusters"
-# algo2.OutputLevel = VERBOSE
- jetRecoSequence += algo2
- print algo2
- for tool in algo2.ClusterMakerTools:
- print tool
+ # Jet Reco:
# PseudoJetAlgorithm uses a tool to convert IParticles (eg CaloClusters)
# to PseudoJets, which are the input to FastJet. The PseudoJets are
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
index d040970ebaee676ec599fb1c54639d61c05d51ae..2c2629dc1446c29e04231004f16a7fc3d00fdd82 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/photonMenuDefs.py
@@ -13,6 +13,8 @@ from AthenaCommon.CFElements import parOR, seqOR, seqAND, stepSeq
from ViewAlgs.ViewAlgsConf import EventViewCreatorAlgorithm
+
+
def photonMenuSequence():
""" Creates secpond step photon sequence"""
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
index 16b036025671064828378d92078ebda222294816..03e5111f2f535db5b21c08d943ef88e1d61c1534 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/electron.menu.py
@@ -15,7 +15,7 @@ from TrigUpgradeTest.electronMenuDefs import electronMenuSequence
-fastCaloStep= fastCaloMenuSequence()
+fastCaloStep= fastCaloMenuSequence("Ele")
electronStep= electronMenuSequence()
step1=ChainStep("Step1_etcut", [fastCaloStep])
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
index b0154c927615c35a87500d2b65b438d62532b3db..d2fc0ab4cd97a975d089b1fc269628a79e206050 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
@@ -16,7 +16,7 @@ include("TrigUpgradeTest/testHLT_MT.py")
##########################################
doElectron = True
-doPhoton = False
+doPhoton = True
doMuon = True
doJet = False
doCombo = True
@@ -38,7 +38,7 @@ testChains = []
if (doElectron):
from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
from TrigUpgradeTest.electronMenuDefs import electronMenuSequence
- fastCaloStep=fastCaloMenuSequence()
+ fastCaloStep=fastCaloMenuSequence("Ele")
electronStep=electronMenuSequence()
step1=ChainStep("Step1_etcut", [fastCaloStep])
@@ -59,7 +59,7 @@ if (doPhoton):
from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
from TrigUpgradeTest.photonMenuDefs import photonMenuSequence
- fastCaloStep=fastCaloMenuSequence()
+ fastCaloStep=fastCaloMenuSequence("Gamma")
photonstep= photonMenuSequence()
photonChains = [
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
index b9b48953fdd837efef64871f689f80daad6c7bac..c3bc1b25545a43219d46ec8d3f7006b315f42ecf 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
@@ -1,40 +1,51 @@
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 0 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 0 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 0 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 0 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 1 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 1 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 1 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 2 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 2 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 2 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 2 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 3 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 3 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 3 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 3 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 3 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 4 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 4 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 4 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 4 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 4 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 4 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 5 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 5 0 DEBUG +++ HLT_mu6 ID#1672162766
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989
@@ -42,62 +53,79 @@ TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut ID#271
TriggerSummaryStep1 5 0 DEBUG +++ HLT_e3_etcut_mu6 ID#3189262314
TriggerSummaryStep2 5 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep2 5 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 5 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 5 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 5 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 6 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 6 0 DEBUG +++ HLT_mu6 ID#1672162766
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 6 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 6 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 6 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 6 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 7 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 7 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 7 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 7 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 7 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 8 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 8 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 8 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 8 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 8 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 8 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 10 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 10 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 10 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 10 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 10 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 11 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 11 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 11 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 11 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 12 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 12 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 12 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 12 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 13 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 13 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 13 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 13 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 13 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 13 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 14 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 14 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 14 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 14 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6Comb ID#393364983
TriggerSummaryStep1 15 0 DEBUG +++ HLT_mu6 ID#1672162766
@@ -105,21 +133,27 @@ TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut1step I
TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 17 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 17 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 17 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 17 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 18 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep2 18 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 19 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep2 19 0 DEBUG +++ HLT_g5_etcut ID#1407390618
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e7_etcut ID#2430733989
TriggerSummaryStep2 19 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TrigSignatureMoniMT INFO HLT_2mu6 20 20 0 0 0
@@ -136,6 +170,8 @@ TrigSignatureMoniMT INFO HLT_e5_etcut
TrigSignatureMoniMT INFO HLT_e5_etcut decisions 50 251
TrigSignatureMoniMT INFO HLT_e7_etcut 20 20 15 14 14
TrigSignatureMoniMT INFO HLT_e7_etcut decisions 36 205
+TrigSignatureMoniMT INFO HLT_g5_etcut 20 20 17 17 17
+TrigSignatureMoniMT INFO HLT_g5_etcut decisions 50 50
TrigSignatureMoniMT INFO HLT_mu6 20 20 3 0 3
TrigSignatureMoniMT INFO HLT_mu6 decisions 3 0
TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 2
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py
index 747cad9b8aef2982edf8eca6c63b5c7ed95fcb93..e16ea3c8628d10b6bc8ec7601622a71e940d5919 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/photon.menu.py
@@ -12,7 +12,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.MenuComponents import Chain, ChainStep
from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
from TrigUpgradeTest.photonMenuDefs import photonMenuSequence
-calostep=fastCaloMenuSequence()
+calostep=fastCaloMenuSequence("Gamma")
photonstep= photonMenuSequence()
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
index 4c6b5285e4733751fb7a232c72ed1cd29b0b1404..d0bbca932da1ec883a62d100f3b736a1128bf441 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Egamma/ElectronDef.py
@@ -13,7 +13,7 @@ from TriggerMenuMT.HLTMenuConfig.Menu.TriggerConfigHLT import TriggerConfigHLT
# fragments generating configuration will be functions in New JO, so let's make them functions already now
def fastCaloSequenceCfg( flags ):
from TrigUpgradeTest.CaloMenuDefs import fastCaloMenuSequence
- return fastCaloMenuSequence()
+ return fastCaloMenuSequence("Electron")
def electronSequenceCfg( flags ):
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
index ab6fbb444d4735c39bef65aa495eaf67c9f2fbed..afd007762c544fb6101d7a2570e34bf8f15da0ca 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Menu/MenuComponents.py
@@ -313,6 +313,9 @@ class MenuSequence():
#### Add input/output Decision to Hypo
self.hypo.setPreviousDecision( input_maker_output)
hypo_output = CFNaming.hypoAlgOutName(self.hypo.Alg.name(), input_maker_output)
+ if len(self.hypo.getOutputList()):
+ log.error("Hypo %s has already an output configured: you may want to duplicate the Hypo!")
+ sys.exit("ERROR, in chain configuration")
self.hypo.addOutput(hypo_output)
# needed for drawing