Skip to content
Snippets Groups Projects
Commit 1c8ea17f authored by scott snyder's avatar scott snyder
Browse files

TriggerMenuMT: python 2 compatibility.

Fix uses of f"" and super() to work with py2.
parent 31dc8fc8
No related branches found
No related tags found
6 merge requests!58791DataQualityConfigurations: Modify L1Calo config for web display,!46784MuonCondInterface: Enable thread-safety checking.,!46776Updated LArMonitoring config file for WD to match new files produced using MT,!45405updated ART test cron job,!42417Draft: DIRE and VINCIA Base Fragments for Pythia 8.3,!36085TriggerMenuMT: python 2 compatibility.
# #
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# #
from .ConfigHelpers import AlgConfig, jetRecoDictForMET from .ConfigHelpers import AlgConfig, jetRecoDictForMET
...@@ -233,7 +233,7 @@ class CVFPufitConfig(AlgConfig): ...@@ -233,7 +233,7 @@ class CVFPufitConfig(AlgConfig):
return "cvfpufit" return "cvfpufit"
def __init__(self, **recoDict): def __init__(self, **recoDict):
super().__init__(**recoDict) super(CVFPufitConfig, self).__init__(**recoDict)
from .METRecoSequences import cvfClusterSequence from .METRecoSequences import cvfClusterSequence
from TrigEFMissingET.TrigEFMissingETConf import ( from TrigEFMissingET.TrigEFMissingETConf import (
HLT__MET__CVFPrepAlg, HLT__MET__CVFPrepAlg,
...@@ -269,7 +269,7 @@ class MHTPufitConfig(AlgConfig): ...@@ -269,7 +269,7 @@ class MHTPufitConfig(AlgConfig):
return "mhtpufit" return "mhtpufit"
def __init__(self, **recoDict): def __init__(self, **recoDict):
super().__init__(**recoDict) super(MHTPufitConfig, self).__init__(**recoDict)
from ..Jet.JetRecoSequences import jetRecoSequence from ..Jet.JetRecoSequences import jetRecoSequence
from ..Jet.JetRecoConfiguration import defineJets from ..Jet.JetRecoConfiguration import defineJets
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import ( from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
......
# #
# Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration # Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration
# #
...@@ -82,7 +82,7 @@ def cvfClusterSequence(dummyFlags, RoIs, **recoDict): ...@@ -82,7 +82,7 @@ def cvfClusterSequence(dummyFlags, RoIs, **recoDict):
LCCaloClusterRecoSequence, flags=None, RoIs=RoIs LCCaloClusterRecoSequence, flags=None, RoIs=RoIs
) )
else: else:
raise ValueError(f"Unsupported calib state {calib} requested!") raise ValueError("Unsupported calib state %s requested!" % calib)
trkopt = "ftf" trkopt = "ftf"
trackSeq, trackColls = RecoFragmentsPool.retrieve( trackSeq, trackColls = RecoFragmentsPool.retrieve(
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment