diff --git a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
index 230638ee652eebd8a2a027fd38d8d88277036fef..94c91bafcdd2fe9045fbe8c042fa1322cd779055 100644
--- a/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
+++ b/Trigger/TrigAlgorithms/TrigT2CaloCommon/python/CaloDef.py
@@ -12,29 +12,31 @@ def setMinimalCaloSetup() :
########################
## ALGORITHMS
+# defined as private within this module, so that they can be configured only in functions in this module
########################
-def algoHLTCaloCell(inputEDM='FSRoI', outputEDM='CellsClusters', RoIMode=True, OutputLevel=ERROR) :
+def _algoHLTCaloCell(name="HLTCaloCellMaker", inputEDM='FSRoI', outputEDM='CellsClusters', RoIMode=True, OutputLevel=ERROR) :
setMinimalCaloSetup();
from AthenaCommon.AppMgr import ServiceMgr as svcMgr
from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
- algo=HLTCaloCellMaker("HLTCaloCellMaker");
+ algo=HLTCaloCellMaker(name)
+ #"HLTCaloCellMaker"
algo.RoIs=inputEDM
algo.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
algo.OutputLevel=OutputLevel
algo.CellsName=outputEDM
return algo;
-def algoHLTTopoCluster(inputEDM="CellsClusters", OutputLevel=ERROR) :
+def _algoHLTTopoCluster(inputEDM="CellsClusters", OutputLevel=ERROR) :
from TrigCaloRec.TrigCaloRecConfig import TrigCaloClusterMakerMT_topo
algo = TrigCaloClusterMakerMT_topo(doMoments=True, doLC=False, cells=inputEDM)
algo.OutputLevel=OutputLevel
return algo
-def algoL2Egamma(inputEDM="EMRoIs",OutputLevel=ERROR):
+def _algoL2Egamma(inputEDM="EMRoIs",OutputLevel=ERROR):
setMinimalCaloSetup();
from TrigT2CaloEgamma.TrigT2CaloEgammaConfig import T2CaloEgamma_ReFastAlgo
- algo=T2CaloEgamma_ReFastAlgo("FastCaloAlgo")
+ algo=T2CaloEgamma_ReFastAlgo("FastCaloL2EgammaAlg")
algo.RoIs=inputEDM
algo.ClustersName="L2CaloClusters" # defalut value, added for debugging
algo.OutputLevel=OutputLevel
@@ -46,8 +48,7 @@ def algoL2Egamma(inputEDM="EMRoIs",OutputLevel=ERROR):
####################################
def fastCaloRecoSequence(InViewRoIs):
- from TrigT2CaloCommon.CaloDef import algoL2Egamma
- fastCaloAlg = algoL2Egamma(OutputLevel=DEBUG,inputEDM=InViewRoIs)
+ fastCaloAlg = _algoL2Egamma(OutputLevel=DEBUG,inputEDM=InViewRoIs)
fastCaloInViewSequence = seqAND( 'fastCaloInViewSequence', [fastCaloAlg] )
sequenceOut = fastCaloAlg.ClustersName
return (fastCaloInViewSequence, sequenceOut)
@@ -65,6 +66,7 @@ def fastCaloEVCreator():
def createFastCaloSequence(EMRoIDecisions):
+ """Used for standalone testing"""
(fastCaloViewsMaker, InViewRoIs) = fastCaloEVCreator()
# connect to RoIs
fastCaloViewsMaker.InputMakerInputDecisions = [ EMRoIDecisions ]
@@ -77,13 +79,17 @@ def createFastCaloSequence(EMRoIDecisions):
-def HLTCaloCellRecoSequence(RoIs):
+def HLTCaloTopoRecoSequence(RoIs='FSRoI'):
CellsClusters = 'CellsClusters'
- algo1= algoHLTCaloCell(RoIs, outputEDM=CellsClusters, RoIMode=True, OutputLevel=DEBUG)
- algo2= algoHLTTopoCluster(inputEDM=CellsClusters, OutputLevel=DEBUG)
- RecoSequence = parOR("ClusterRecoSequence", [algo1, algo2])
+ algo1= _algoHLTCaloCell(name="HLTCaloCellMakerForJet", inputEDM=RoIs, outputEDM=CellsClusters, RoIMode=True, OutputLevel=DEBUG)
+ algo2= _algoHLTTopoCluster(inputEDM=CellsClusters, OutputLevel=DEBUG)
+ RecoSequence = parOR("TopoClusterRecoSequence", [algo1, algo2])
print algo2
for tool in algo2.ClusterMakerTools:
print tool
return RecoSequence
+
+def HLTCellMakerMET(RoIs):
+ cellMakerAlgo = _algoHLTCaloCell(name="HLTCaloCellMakerForMET", inputEDM=RoIs, outputEDM='CaloCells')
+ return cellMakerAlgo
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
index 274f427d746b9d4f1bf77c048b4063f230966083..ef57766d5c2e825be8ae5043b9f083d11587483c 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
+++ b/Trigger/TrigValidation/TrigUpgradeTest/CMakeLists.txt
@@ -154,7 +154,7 @@ atlas_add_test( idCaloRunData
file( MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_CaloOnlyRunData )
atlas_add_test( CaloOnlyRunData
SCRIPT test/test_calo_only_data.sh
- EXTRA_PATTERNS "-s FastCaloAlgo.*REGTEST*"
+ EXTRA_PATTERNS "-s FastCaloL2EgammaAlg.*REGTEST*"
PROPERTIES TIMEOUT 1000
PROPERTIES WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/unitTestRun_CaloOnlyRunData
)
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
index 4d44875cff421485397b688fd2f715af874a9506..3d504e7bc33f3c66d6452343f31163bf44f0d79a 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
@@ -24,10 +24,10 @@ def jetAthSequence(ConfigFlags):
return (JetAthSequence, InputMakerAlg, sequenceOut)
-def jetRecoSequence(RoIs):
+def jetRecoSequence(RoIs = 'FSJETRoI'):
# calo Cluster reco
- from TrigT2CaloCommon.CaloDef import HLTCaloCellRecoSequence
- jetRecoSequence = HLTCaloCellRecoSequence(RoIs)
+ from TrigT2CaloCommon.CaloDef import HLTCaloTopoRecoSequence
+ jetRecoSequence = HLTCaloTopoRecoSequence(RoIs)
from AthenaCommon.AppMgr import ToolSvc
# Jet Reco:
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
index eac0537f8f38ad59f40f2fac1c7247f0586ba421..0d0f2b1350dc16e1d3a15f7a553e385bd58c2e67 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/metDefs.py
@@ -41,8 +41,8 @@ def metCellRecoSequence(RoIs):
# Get cells
#################################################
- from TrigT2CaloCommon.CaloDef import algoHLTCaloCell
- cellMakerAlgo = algoHLTCaloCell(inputEDM=RoIs, outputEDM='CaloCells')
+ from TrigT2CaloCommon.CaloDef import HLTCellMakerMET
+ cellMakerAlgo = HLTCellMakerMET(RoIs)
metCellRecoSequence += cellMakerAlgo
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
index 771502d7c6dcd8fb81ba4af424909e6a5f25e9d8..e0af8115b999426fd8a8baa4dc3ad19477a511b9 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
@@ -34,10 +34,12 @@ steps += topSequence.L1DecoderTest
if TriggerFlags.doCalo:
if ( doHLTCaloTopo ) :
-
- from TrigT2CaloCommon.CaloDef import algoHLTCaloCell, algoHLTTopoCluster
- steps+=algoHLTCaloCell(OutputLevel=DEBUG)
- steps+=algoHLTTopoCluster(OutputLevel=DEBUG)
+ from TrigT2CaloCommon.CaloDef import HLTCaloTopoRecoSequence
+ recosequence= HLTCaloTopoRecoSequence()
+ steps+=recosequence
+ # from TrigT2CaloCommon.CaloDef import algoHLTCaloCell, algoHLTTopoCluster
+# steps+=algoHLTCaloCell(OutputLevel=DEBUG)
+# steps+=algoHLTTopoCluster(OutputLevel=DEBUG)
if ( doL2Egamma ) :
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/CaloOnlyRunData.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/CaloOnlyRunData.ref
index 39a902c760bf0868942b7607fdd2cf887cdb2c1b..f34d1d5eae016da9cd99299d87fbd174d5652552 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/CaloOnlyRunData.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/CaloOnlyRunData.ref
@@ -1,15 +1,225 @@
-FastCaloAlgo 1 0 INFO REGTEST : DONE
-FastCaloAlgo 2 0 INFO REGTEST : DONE
-FastCaloAlgo 5 0 INFO REGTEST : DONE
-FastCaloAlgo 5 0 INFO REGTEST : DONE
-FastCaloAlgo 5 0 INFO REGTEST : DONE
-FastCaloAlgo 5 0 INFO REGTEST : DONE
-FastCaloAlgo 5 0 INFO REGTEST : DONE
-FastCaloAlgo 7 0 INFO REGTEST : DONE
-FastCaloAlgo 7 0 INFO REGTEST : DONE
-FastCaloAlgo 8 0 INFO REGTEST : DONE
-FastCaloAlgo 9 0 INFO REGTEST : DONE
-FastCaloAlgo 9 0 INFO REGTEST : DONE
-FastCaloAlgo 9 0 INFO REGTEST : DONE
-FastCaloAlgo 9 0 INFO REGTEST : DONE
-FastCaloAlgo 9 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: emEnergy = 1948
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: hadEnergy = -113
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: e237= 498
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: e277= 952
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: clusterWidth = 0.015682
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: frac73 = -0.0181818
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: e233 = 574
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: wstot = 15.8327
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: eta = -0.220436
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: phi = -1.97753
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: Eta1 = -0.228699
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 1 0 DEBUG REGTEST: roiWord = 0xa9eb1f08
+FastCaloL2EgammaAlg 1 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: emEnergy = 2544
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: hadEnergy = -137
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: e237= 1510
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: e277= 667
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: clusterWidth = 0.00261401
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: frac73 = 0.415385
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: e233 = 1634
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: wstot = -9999
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: eta = 1.21701
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: phi = 1.19091
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: Eta1 = 1.20893
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 2 0 DEBUG REGTEST: roiWord = 0xa2f01f07
+FastCaloL2EgammaAlg 2 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: emEnergy = 5129
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: hadEnergy = 557.148
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e237= 3442
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e277= 4743
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: clusterWidth = 0.0200349
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: frac73 = 0.487952
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e233 = 2451
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: wstot = 6.1966
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: eta = 0.66515
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: phi = 0.771858
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: Eta1 = 0.662072
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: roiWord = 0xa25e1f09
+FastCaloL2EgammaAlg 5 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: emEnergy = 63629
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: hadEnergy = 3562
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e237= 52341
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e277= 54392
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: clusterWidth = 0.0215697
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: frac73 = 99
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e233 = 45475
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: wstot = -9999
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: eta = -2.46485
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: phi = 2.61952
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: Eta1 = -2.44119
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: roiWord = 0xa46d0210
+FastCaloL2EgammaAlg 5 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: emEnergy = 6126
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: hadEnergy = 32
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e237= 5815
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e277= 7215
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: clusterWidth = 0.0159176
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: frac73 = -0.149254
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e233 = 4942
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: wstot = 8.9998
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: eta = -0.526452
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: phi = 2.55717
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: Eta1 = -0.537374
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: roiWord = 0xa5a3010d
+FastCaloL2EgammaAlg 5 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: emEnergy = 56965
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: hadEnergy = -359
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e237= 28865
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e277= 30797
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: clusterWidth = 0.0124255
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: frac73 = 0.870855
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e233 = 25057
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: wstot = 3.36897
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: eta = -1.33618
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: phi = -0.424231
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: Eta1 = -1.34045
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: roiWord = 0xad2e1f35
+FastCaloL2EgammaAlg 5 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: emEnergy = 44675
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: hadEnergy = 2940
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e237= 22224
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e277= 25771
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: clusterWidth = 0.0162035
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: frac73 = 0.614681
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: e233 = 19452
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: wstot = 4.25774
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: eta = 1.97138
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: phi = -0.748126
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: Eta1 = 1.9601
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 5 0 DEBUG REGTEST: roiWord = 0xaf1f1f19
+FastCaloL2EgammaAlg 5 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: emEnergy = 7019
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: hadEnergy = -9
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: e237= 2955
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: e277= 3824
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: clusterWidth = 0.0213068
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: frac73 = 0.439114
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: e233 = 2017
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: wstot = 11.5079
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: eta = 0.925467
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: phi = -2.29943
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: Eta1 = 0.933708
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: roiWord = 0xaaa11708
+FastCaloL2EgammaAlg 7 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: emEnergy = 1073
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: hadEnergy = 451.024
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: e237= 923
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: e277= 2001
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: clusterWidth = 0.0202742
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: frac73 = 0.197531
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: e233 = 1204
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: wstot = 11.7401
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: eta = 0.373383
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: phi = -1.2267
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: Eta1 = 0.358057
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 7 0 DEBUG REGTEST: roiWord = 0xae0e1f08
+FastCaloL2EgammaAlg 7 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: emEnergy = 23968
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: hadEnergy = -372
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: e237= 13197
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: e277= 18758
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: clusterWidth = 0.0181611
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: frac73 = 0.369116
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: e233 = 12251
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: wstot = 7.32331
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: eta = -1.16727
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: phi = -2.18836
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: Eta1 = -1.16854
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 8 0 DEBUG REGTEST: roiWord = 0xa925011b
+FastCaloL2EgammaAlg 8 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: emEnergy = 10276
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: hadEnergy = 228
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e237= 3148
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e277= 4355
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: clusterWidth = 0.0192897
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: frac73 = 0.258845
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e233 = 3185
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: wstot = 6.52753
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: eta = -0.729335
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: phi = 2.29068
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: Eta1 = -0.732269
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: roiWord = 0xa59a1f0e
+FastCaloL2EgammaAlg 9 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: emEnergy = 3640
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: hadEnergy = -248.5
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e237= 1789
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e277= 2525
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: clusterWidth = 0.0186729
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: frac73 = 0.16819
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e233 = 1854
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: wstot = 9.37724
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: eta = -0.403096
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: phi = 2.80318
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: Eta1 = -0.418612
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: roiWord = 0xa5b51f07
+FastCaloL2EgammaAlg 9 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: emEnergy = 6856
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: hadEnergy = 97.5
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e237= 2157
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e277= 3593
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: clusterWidth = 0.0220817
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: frac73 = 0.264512
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e233 = 2369
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: wstot = 6.84194
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: eta = 0.105456
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: phi = 2.95734
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: Eta1 = 0.0979492
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: roiWord = 0xa6321f08
+FastCaloL2EgammaAlg 9 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: emEnergy = 9199
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: hadEnergy = 619.342
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e237= 2613
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e277= 4381
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: clusterWidth = 0.0186962
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: frac73 = 0.690211
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e233 = 1571
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: wstot = 4.34307
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: eta = 1.16894
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: phi = 1.69791
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: Eta1 = 1.17086
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: roiWord = 0xa6850109
+FastCaloL2EgammaAlg 9 0 INFO REGTEST : DONE
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: emEnergy = 22566
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: hadEnergy = 5845
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e237= 11730
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e277= 15461
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: clusterWidth = 0.0159673
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: frac73 = 0.627635
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: e233 = 8676
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: wstot = 9.86083
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: eta = 1.8302
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: phi = 2.73072
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: Eta1 = 1.80997
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: calZ0 = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: quality = 0
+FastCaloL2EgammaAlg 9 0 DEBUG REGTEST: roiWord = 0xa72b020c
+FastCaloL2EgammaAlg 9 0 INFO REGTEST : DONE
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
index 2f50bd079e59faab845a55f2984b24b986df3de8..923d94aa72cc277351db45e345280043e966d315 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.py
@@ -19,6 +19,7 @@ doElectron = True
doPhoton = True
doMuon = True
doJet = True
+doMET = True
doBJet = False
doCombo = True
@@ -141,6 +142,22 @@ if (doBJet):
]
testChains += bjetChains
+
+##################################################################
+# MET chains
+##################################################################
+if (doMET):
+ from TrigUpgradeTest.metMenuDefs import metCellSequence
+
+ metCellSeq = metCellSequence()
+ metCellStep = ChainStep("Step1_met_cell", [metCellSeq])
+ metChains = [
+ Chain(name="HLT_xe65_L1XE50", Seed="L1_XE50", ChainSteps=[metCellStep]),
+ Chain(name="HLT_xe30_L1XE10", Seed="L1_XE10", ChainSteps=[metCellStep])
+ ]
+
+ testChains += metChains
+
##################################################################
# combined chains
##################################################################
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
index e543b0835e7515dd2a4b22846660cfdd665cdb62..f235b86abb82468c5f2906284ba1024f2872bddc 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/fullMenu.ref
@@ -1,3 +1,4 @@
+TriggerSummaryStep1 0 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 0 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 0 0 DEBUG +++ HLT_j100 ID#625306965
TriggerSummaryStep1 0 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -9,6 +10,7 @@ TriggerSummaryStep2 0 0 DEBUG +++ HLT_e5_etcut ID#607
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_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 1 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 1 0 DEBUG +++ HLT_j100 ID#625306965
TriggerSummaryStep1 1 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -29,6 +31,7 @@ TriggerSummaryStep2 2 0 DEBUG +++ HLT_e5_etcut ID#607
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_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 3 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 3 0 DEBUG +++ HLT_j100 ID#625306965
TriggerSummaryStep1 3 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -49,6 +52,7 @@ TriggerSummaryStep2 4 0 DEBUG +++ HLT_e5_etcut ID#607
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_xe30_L1XE10 ID#347649004
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
@@ -62,6 +66,7 @@ TriggerSummaryStep2 5 0 DEBUG +++ HLT_e5_etcut ID#607
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_xe30_L1XE10 ID#347649004
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
@@ -83,6 +88,7 @@ TriggerSummaryStep2 7 0 DEBUG +++ HLT_e5_etcut ID#607
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_xe30_L1XE10 ID#347649004
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
@@ -92,6 +98,7 @@ TriggerSummaryStep2 8 0 DEBUG +++ HLT_e5_etcut ID#607
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 9 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 10 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 10 0 DEBUG +++ HLT_j100 ID#625306965
TriggerSummaryStep1 10 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -110,7 +117,9 @@ TriggerSummaryStep1 11 0 DEBUG +++ HLT_e3_etcut ID#271
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_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 12 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 12 0 DEBUG +++ HLT_xe65_L1XE50 ID#1283272884
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
@@ -130,7 +139,9 @@ TriggerSummaryStep2 13 0 DEBUG +++ HLT_e5_etcut ID#607
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_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 14 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 14 0 DEBUG +++ HLT_xe65_L1XE50 ID#1283272884
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
@@ -139,10 +150,13 @@ TriggerSummaryStep2 14 0 DEBUG +++ HLT_g5_etcut ID#140
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
+TriggerSummaryStep1 16 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut1step ID#1509456583
TriggerSummaryStep1 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158
TriggerSummaryStep2 16 0 DEBUG +++ HLT_e3_etcut ID#2711808158
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 17 0 DEBUG +++ HLT_e5_etcut ID#607406625
+TriggerSummaryStep1 17 0 DEBUG +++ HLT_xe65_L1XE50 ID#1283272884
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
@@ -157,6 +171,7 @@ TriggerSummaryStep1 18 0 DEBUG +++ HLT_e3_etcut1step I
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_xe30_L1XE10 ID#347649004
TriggerSummaryStep1 19 0 DEBUG +++ HLT_e5_etcut ID#607406625
TriggerSummaryStep1 19 0 DEBUG +++ HLT_j100 ID#625306965
TriggerSummaryStep1 19 0 DEBUG +++ HLT_g5_etcut ID#1407390618
@@ -192,3 +207,7 @@ TrigSignatureMoniMT INFO HLT_mu6
TrigSignatureMoniMT INFO HLT_mu6 decisions 3 0
TrigSignatureMoniMT INFO HLT_mu6Comb 20 20 3 2 2
TrigSignatureMoniMT INFO HLT_mu6Comb decisions 3 2
+TrigSignatureMoniMT INFO HLT_xe30_L1XE10 20 20 12 0 12
+TrigSignatureMoniMT INFO HLT_xe30_L1XE10 decisions 12 0
+TrigSignatureMoniMT INFO HLT_xe65_L1XE50 20 20 3 0 3
+TrigSignatureMoniMT INFO HLT_xe65_L1XE50 decisions 3 0