From 1c8ea17f9660db83f6466e660b66e77021ee7758 Mon Sep 17 00:00:00 2001
From: scott snyder <snyder@bnl.gov>
Date: Mon, 31 Aug 2020 16:31:36 +0200
Subject: [PATCH] TriggerMenuMT: python 2 compatibility.
Fix uses of f"" and super() to work with py2.
---
.../TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py | 6 +++---
.../python/HLTMenuConfig/MET/METRecoSequences.py | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
index 478dad3ae16e..7a4936428fde 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/AlgConfigs.py
@@ -1,5 +1,5 @@
#
-# 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
@@ -233,7 +233,7 @@ class CVFPufitConfig(AlgConfig):
return "cvfpufit"
def __init__(self, **recoDict):
- super().__init__(**recoDict)
+ super(CVFPufitConfig, self).__init__(**recoDict)
from .METRecoSequences import cvfClusterSequence
from TrigEFMissingET.TrigEFMissingETConf import (
HLT__MET__CVFPrepAlg,
@@ -269,7 +269,7 @@ class MHTPufitConfig(AlgConfig):
return "mhtpufit"
def __init__(self, **recoDict):
- super().__init__(**recoDict)
+ super(MHTPufitConfig, self).__init__(**recoDict)
from ..Jet.JetRecoSequences import jetRecoSequence
from ..Jet.JetRecoConfiguration import defineJets
from TriggerMenuMT.HLTMenuConfig.CommonSequences.CaloSequenceSetup import (
diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
index 97f07be4409c..ed46a197e23f 100644
--- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
+++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py
@@ -1,5 +1,5 @@
#
-# 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):
LCCaloClusterRecoSequence, flags=None, RoIs=RoIs
)
else:
- raise ValueError(f"Unsupported calib state {calib} requested!")
+ raise ValueError("Unsupported calib state %s requested!" % calib)
trkopt = "ftf"
trackSeq, trackColls = RecoFragmentsPool.retrieve(
--
GitLab