From 09964ac46bc075adb1a54de04533f2a1badaca96 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 12 Dec 2019 16:16:34 +0100 Subject: [PATCH 1/4] TrigEgammaHypo: Basic python3 fixes. print function. Relative import fixes. --- .../TrigEgammaHypo/python/TrigEGammaPIDdefsHI.py | 16 +++++++++------- .../python/TrigL2CaloHypoConfig.py | 4 ++-- .../TrigEgammaHypo/python/TrigL2CaloHypoTool.py | 2 +- .../python/TrigL2PhotonHypoConfig.py | 4 ++-- 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEGammaPIDdefsHI.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEGammaPIDdefsHI.py index a52632b34d9..3e0afaab882 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEGammaPIDdefsHI.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigEGammaPIDdefsHI.py @@ -2,6 +2,8 @@ # flake8: noqa (legacy trigger) +from __future__ import print_function + from ElectronPhotonSelectorTools.TrigEGammaPIDdefs import BitDefElectron, CutDefElectron @@ -32,10 +34,10 @@ ElectronIsEMBits = {'loose': SelectionDefElectron.ElectronLooseHI, 'medium': SelectionDefElectron.ElectronMediumHI, 'medium1': SelectionDefElectron.ElectronMediumHI} -print "" -print "============================================================================" -print "==== TrigEgamma isEM bit masks HI =====" -print "==== ElectronLoose: 0x%08x =====" % SelectionDefElectron.ElectronLooseHI -print "==== ElectronMedium: 0x%08x =====" % SelectionDefElectron.ElectronMediumHI -print "===============================================================================" -print "" +print ("") +print ("============================================================================") +print ("==== TrigEgamma isEM bit masks HI =====") +print ("==== ElectronLoose: 0x%08x =====" % SelectionDefElectron.ElectronLooseHI) +print ("==== ElectronMedium: 0x%08x =====" % SelectionDefElectron.ElectronMediumHI) +print ("===============================================================================") +print ("") diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoConfig.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoConfig.py index c26b6e4c06a..5030ceae351 100755 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoConfig.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoConfig.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration ############################## # L2 Electron and Photon Calorimeter Hypothesis Algorithm Configuration: @@ -11,7 +11,7 @@ from AthenaCommon.SystemOfUnits import GeV from TriggerJobOpts.TriggerFlags import TriggerFlags menu_name = TriggerFlags.triggerMenuSetup() -from TrigL2CaloHypoCutDefs import L2CaloCutMaps +from .TrigL2CaloHypoCutDefs import L2CaloCutMaps class TrigL2CaloHypoBase (TrigL2CaloHypo): __slots__ = [] def __init__(self, name): diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py index 64cfffe19ac..4eca5247cb3 100644 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2CaloHypoTool.py @@ -5,7 +5,7 @@ from AthenaMonitoring.GenericMonitoringTool import GenericMonitoringTool from TriggerJobOpts.TriggerFlags import TriggerFlags from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2CaloHypoToolInc -from TrigL2CaloHypoCutDefs import L2CaloCutMaps +from TrigEgammaHypo.TrigL2CaloHypoCutDefs import L2CaloCutMaps from AthenaCommon.Logging import logging log = logging.getLogger('TrigL2CaloHypoTool') diff --git a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoConfig.py b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoConfig.py index 0ed4239098b..50a8b126872 100755 --- a/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoConfig.py +++ b/Trigger/TrigHypothesis/TrigEgammaHypo/python/TrigL2PhotonHypoConfig.py @@ -1,9 +1,9 @@ -# Copyright (C) 2002-2017 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration from TrigEgammaHypo.TrigEgammaHypoConf import TrigL2PhotonHypo from AthenaCommon.SystemOfUnits import GeV -from TrigL2CaloHypoCutDefs import L2CaloPhotonCutMaps +from .TrigL2CaloHypoCutDefs import L2CaloPhotonCutMaps # basic cut class TrigL2PhotonHypoBase (TrigL2PhotonHypo): __slots__ = [] -- GitLab From ac71a7c5082fc5cf7ab35a5ad291c2708b6263b7 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 12 Dec 2019 16:16:54 +0100 Subject: [PATCH 2/4] TrigHLTJetHypo: Basic python3 fixes. Relative import fixes. --- .../TrigHLTJetHypo/python/TrigHLTJetHypoConfig.py | 4 ++-- Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigHLTJetHypoConfig.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigHLTJetHypoConfig.py index 86d3359ae4e..9e24372d650 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigHLTJetHypoConfig.py +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/TrigHLTJetHypoConfig.py @@ -1,11 +1,11 @@ # Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration # from TrigHLTJetHypo.TrigHLTJetHypoConf import TrigHLTJetHypo -import TrigHLTJetHypoConf +from . import TrigHLTJetHypoConf # modules to decide whether to add monitoring plots # this is chain dependent. -from JetCleanMonitoring import JetChainsToKeepMonitoring +from .JetCleanMonitoring import JetChainsToKeepMonitoring from TriggerMenu.menu.CleanMonitoring import KeepMonitoring # from TriggerMenu.menu.CleanMonitoring import DisableMonitoringButValAndTime diff --git a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py index aa77effed4c..358e4e69bda 100644 --- a/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py +++ b/Trigger/TrigHypothesis/TrigHLTJetHypo/python/node.py @@ -11,7 +11,7 @@ name TrigJetHypoToolConfig_XXX. from __future__ import print_function -from constants import logicals +from .constants import logicals -- GitLab From 00b4e5f48a190cdce7270d5acee36682cffd3415 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Thu, 12 Dec 2019 16:17:08 +0100 Subject: [PATCH 3/4] TrigMuonHypoMT: Basic python3 fixes. string/number comparison --- .../TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py index 232f38659b4..c2408403b39 100755 --- a/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py +++ b/Trigger/TrigHypothesis/TrigMuonHypoMT/python/TrigMuonHypoMTConfig.py @@ -271,7 +271,7 @@ class TrigMufastHypoConfig(object): tool.PtThresholds[th] = [ -1. * GeV ] tool.AcceptAll = True else: - if "idperf" in toolName or thvalue < 5: + if "idperf" in toolName or int(thvalue) < 5: thvaluename = thvalue + 'GeV_v15a' elif "0eta105" in toolName: thvaluename = thvalue+ "GeV_barrelOnly_v15a" @@ -414,7 +414,7 @@ class TrigmuCombHypoConfig(object): tool.PtBins[th] = [-10000.,10000.] tool.PtThresholds[th] = [ -1. * GeV ] else: - if thvalue >= 24: + if int(thvalue) >= 24: thvaluename = '22GeV_v15a' else: thvaluename = thvalue + 'GeV_v15a' -- GitLab From 19e97a181fd922f78bd7fc6f5ea3e52fbaa0c6f3 Mon Sep 17 00:00:00 2001 From: scott snyder Date: Sun, 15 Dec 2019 05:21:31 +0100 Subject: [PATCH 4/4] Update reference files. --- .../share/q221_RDOtoRDOTrig_mt1_build.ref | 32 +++++++++---------- .../TrigUpgradeTest/share/full_menu_build.ref | 12 +++---- 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref index acce5fb7572..26919ac4096 100644 --- a/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref +++ b/Trigger/TrigValidation/TrigAnalysisTest/share/q221_RDOtoRDOTrig_mt1_build.ref @@ -14,18 +14,18 @@ TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12M TrigSignatureMoniMT INFO HLT_2mu10_bJpsimumu_L12MU10 decisions 12 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 3 3 3 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu10_bUpsimumu_L12MU10 decisions 12 0 0 0 0 -TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 3 3 3 1 1 1 0 1 -TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 12 4 4 4 0 +TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 3 3 3 2 2 1 0 1 +TrigSignatureMoniMT INFO HLT_2mu14_L12MU10 decisions 12 8 8 4 0 TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 4 4 4 2 1 1 1 1 TrigSignatureMoniMT INFO HLT_2mu4_bJpsimumu_L12MU4 decisions 16 4 6 6 1 TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 4 4 4 1 0 0 0 0 TrigSignatureMoniMT INFO HLT_2mu4_bUpsimumu_L12MU4 decisions 16 1 0 0 0 -TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 4 4 4 1 0 0 0 1 -TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 decisions 16 4 0 0 0 -TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 10 10 4 1 1 1 1 0 -TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 decisions 16 4 4 4 1 -TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 4 4 4 1 1 1 0 1 -TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 16 4 4 4 0 +TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 4 4 4 3 0 0 0 3 +TrigSignatureMoniMT INFO HLT_2mu6Comb_L12MU6 decisions 16 12 0 0 0 +TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 10 10 4 3 3 3 2 0 +TrigSignatureMoniMT INFO HLT_2mu6_10invm70_L1MU6 decisions 16 12 18 18 2 +TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 4 4 4 3 3 3 0 3 +TrigSignatureMoniMT INFO HLT_2mu6_L12MU6 decisions 16 12 18 18 0 TrigSignatureMoniMT INFO HLT_3j200_L1J100 3 3 0 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_3j200_L1J100 decisions 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_3j200_L1J20 19 19 0 0 0 0 0 0 @@ -132,18 +132,18 @@ TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondary TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions 10 6 1 1 1 TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU208 8 1 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 decisions 2 0 0 0 0 -TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 10 10 10 5 0 0 0 5 -TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 14 6 0 0 0 -TrigSignatureMoniMT INFO HLT_mu6_L1MU6 10 10 10 5 5 5 0 5 -TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 14 6 6 6 0 +TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 10 10 10 10 0 0 0 10 +TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 14 13 0 0 0 +TrigSignatureMoniMT INFO HLT_mu6_L1MU6 10 10 10 10 10 10 0 10 +TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 14 13 16 16 0 TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 10 10 10 10 10 10 0 10 TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 14 14 17 20 0 -TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 10 10 10 5 5 5 5 5 -TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 14 6 6 6 6 +TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 10 10 10 10 10 10 10 10 +TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 14 13 16 16 16 TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 10 10 10 0 10 0 0 10 TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 14 0 17 0 0 -TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 4 4 4 1 1 1 0 1 -TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 8 2 2 2 0 +TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 4 4 4 4 4 4 0 4 +TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 decisions 8 8 12 11 0 TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 10 10 10 0 0 0 0 10 TrigSignatureMoniMT INFO HLT_mu6fast_L1MU6 decisions 14 0 0 0 0 TrigSignatureMoniMT INFO HLT_mu80_msonly_3layersEC_L1MU208 8 8 0 0 0 0 0 diff --git a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref index 58df312d945..f31de52fc28 100644 --- a/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref +++ b/Trigger/TrigValidation/TrigUpgradeTest/share/full_menu_build.ref @@ -136,14 +136,14 @@ TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondar TrigSignatureMoniMT INFO HLT_mu50_RPCPEBSecondaryReadout_L1MU20 decisions 2 1 0 0 0 TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU2020 20 1 0 0 0 0 0 TrigSignatureMoniMT INFO HLT_mu60_0eta105_msonly_L1MU20 decisions 1 0 0 0 0 -TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 1 0 0 0 1 -TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 1 0 0 0 -TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 1 1 1 0 1 -TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 1 1 1 0 +TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 20 20 3 2 0 0 0 2 +TrigSignatureMoniMT INFO HLT_mu6Comb_L1MU6 decisions 3 2 0 0 0 +TrigSignatureMoniMT INFO HLT_mu6_L1MU6 20 20 3 2 1 1 0 1 +TrigSignatureMoniMT INFO HLT_mu6_L1MU6 decisions 3 2 1 1 0 TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 20 20 3 3 2 2 0 2 TrigSignatureMoniMT INFO HLT_mu6_idperf_L1MU6 decisions 3 3 2 2 0 -TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 20 20 3 1 1 1 1 1 -TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 3 1 1 1 1 +TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 20 20 3 2 1 1 1 1 +TrigSignatureMoniMT INFO HLT_mu6_ivarmedium_L1MU6 decisions 3 2 1 1 1 TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 20 20 3 0 2 0 0 2 TrigSignatureMoniMT INFO HLT_mu6_msonly_L1MU6 decisions 3 0 2 0 0 TrigSignatureMoniMT INFO HLT_mu6_mu4_L12MU4 20 20 0 0 0 0 0 0 -- GitLab