Minor fixes

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)

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