diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py index 8f12eedf038fe67c08978c37776537c05df152fc..307b9ecf1f440f374bfee0a888a97411a9e68100 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py @@ -46,7 +46,7 @@ def extractRecoDict(chainParts): # Translate the reco dict to a string for suffixing etc def jetRecoDictToString(jetRecoDict): - strtemp = "{recoAlg}_{constitMod}_{constitType}_{clusterCalib}_{jetCalib}" + strtemp = "{recoAlg}_{constitMod}{constitType}_{clusterCalib}_{jetCalib}" if jetRecoDict["trkopt"] != "notrk": strtemp += "_{trkopt}_{trkpresel}" return strtemp.format(**jetRecoDict) diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py index 30c6109c6519d47002527b65c0774d92e7da5ad5..4c3ede628db98974b7f11d3f01150e5018250e8c 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/MET/METRecoSequences.py @@ -39,15 +39,15 @@ log = logging.getLogger(__name__) def jetRecoDictForMET(**recoDict): """ Get a jet reco dict that's usable for the MET slice """ jrd = {k: recoDict.get(k, JetChainParts_Default[k]) for k in jetRecoKeys} + # For various reasons, we can store the constituent modifiers separately + # to the data type, so we have to add that back in + jrd["constitMod"] = recoDict.get("constitmod", "") if "jetDataType" in recoDict: # Allow for the renaming dataType -> jetDataType - jrd["constitType"] = recoDict["jetDataType"] + jrd["constitType"] = recoDict["jetDataType"].replace(jrd["constitMod"],"") # strip constitMod from jetDataType if jrd["constitType"] == "pf": # We only use em calibration for PFOs jrd["clusterCalib"] = "em" - # For various reasons, we can store the constituent modifiers separately - # to the data type, so we have to add that back in - jrd["constitMod"] = recoDict.get("constitmod", "") if jrd["jetCalib"] == "default": jrd["jetCalib"] = interpretJetCalibDefault(jrd) return jrd