From e37b4eec7d969e374095d27fb0f6c6af29f099aa Mon Sep 17 00:00:00 2001
From: Denis Oliveira Damazio <damazio@mail.cern.ch>
Date: Thu, 18 Oct 2018 12:50:30 +0200
Subject: [PATCH] Fix MET issue with Tile unpacking. Propagate fix to jet and
Calo examples
Former-commit-id: 6a931a668d990570246d9a3d661bad431fe42212
---
.../TrigCaloRec/python/TrigCaloRecConfig.py | 9 +++++++++
Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py | 5 +++--
Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py | 5 +++--
Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py | 6 ++++--
.../TrigValidation/TrigUpgradeTest/share/jet.recoToy.py | 3 ++-
5 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
index 113679077f4..ee83837ab07 100755
--- a/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
+++ b/Trigger/TrigAlgorithms/TrigCaloRec/python/TrigCaloRecConfig.py
@@ -32,6 +32,9 @@ from TrigCaloRec.TrigCaloClusterMakerMonitoring import TrigL1BSTowerHypoOnlineMo
from CaloClusterCorrection.common import *
from CaloUtils.CaloUtilsConf import *
+# MT stuff
+from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker as _HLTCaloCellMaker
+
from AthenaCommon.Constants import INFO,ERROR,FALSE,TRUE,DEBUG,VERBOSE
from AthenaCommon.SystemOfUnits import GeV,MeV,deg
@@ -1984,3 +1987,9 @@ class TrigCaloClusterMakerMT_EMtopo (TrigCaloClusterMakerMTBase):
self += emtopomoments
+class HLTCaloCellMaker (_HLTCaloCellMaker):
+ __slots__ = []
+ def __init__(self, name):
+ super( HLTCaloCellMaker, self ).__init__(name)
+ self.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
+
diff --git a/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py b/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py
index 9a395cf96f6..a29d3411c71 100644
--- a/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py
+++ b/Trigger/TrigAlgorithms/TrigEFMissingET/share/testMET.py
@@ -24,8 +24,9 @@ svcMgr.TrigCaloDataAccessSvc.OutputLevel=INFO
from L1Decoder.L1DecoderConf import CreateFullScanRoI
topSequence += CreateFullScanRoI()
-from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker
-cellMakerAlgo = HLTCaloCellMaker("CellMakerMT", roiMode=True)
+from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
+cellMakerAlgo = HLTCaloCellMaker("CellMakerMT")
+cellMakerAlgo.roiMode=True
cellMakerAlgo.RoIs="FullScanRoIs"
cellMakerAlgo.OutputLevel=VERBOSE
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
index 155e17fdea4..d6829bdae9e 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/python/jetDefs.py
@@ -41,12 +41,13 @@ def jetRecoSequence(inputMakerOut):
svcMgr.TrigCaloDataAccessSvc.MonTool = mon
- from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker, HLTCaloCellSumMaker
+ from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
+ from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
algo1=HLTCaloCellMaker("testFastAlgo1")
algo1.RoIs=inputMakerOut
# algo1.RoIs="StoreGateSvc+FSJETRoIs"
# temporary fix for Tile
- algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
+ #algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
algo1.roiMode=False
# algo1.roiMode=True
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
index 67534b6af66..d2d5b36ac12 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/Calo.py
@@ -40,11 +40,13 @@ if TriggerFlags.doCalo:
#l1DecoderTest=L1DecoderTest()
#topSequence+=l1DecoderTest
- from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker, HLTCaloCellSumMaker
+ from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker
+ from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
+
algo1=HLTCaloCellMaker("testFastAlgo1")
algo1.RoIs="StoreGateSvc+EMRoIs"
# temporary fix for Tile
- algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
+ #algo1.ExtraInputs=[('TileEMScale','ConditionStore+TileEMScale')]
algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
#algo1.roiMode=False
algo1.OutputLevel=VERBOSE
diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
index 54f027c36f7..718f9de8fbd 100644
--- a/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
+++ b/Trigger/TrigValidation/TrigUpgradeTest/share/jet.recoToy.py
@@ -45,7 +45,8 @@ if TriggerFlags.doCalo:
svcMgr.TrigCaloDataAccessSvc.OutputLevel=INFO
svcMgr.TrigCaloDataAccessSvc.MonTool = mon
- from TrigCaloRec.TrigCaloRecConf import HLTCaloCellMaker, HLTCaloCellSumMaker
+ from TrigCaloRec.TrigCaloRecConfig import HLTCaloCellMaker\
+ from TrigCaloRec.TrigCaloRecConf import HLTCaloCellSumMaker
algo1=HLTCaloCellMaker("testFastAlgo1")
algo1.RoIs="StoreGateSvc+FSJETRoIs"
algo1.TrigDataAccessMT=svcMgr.TrigCaloDataAccessSvc
--
GitLab