diff --git a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py index 7f08fdc43462bfd1afd9c19df877f854434b86e6..d3073597c2994f8bc81afae2e33d20cc8d02e2bd 100644 --- a/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py +++ b/Trigger/TriggerCommon/TriggerMenuMT/python/HLTMenuConfig/Jet/JetRecoConfiguration.py @@ -15,10 +15,19 @@ from AthenaCommon.Logging import logging log = logging.getLogger("TriggerMenuMT.HLTMenuConfig.Jet.JetRecoConfiguration") def interpretJetCalibDefault(recoDict): - if recoDict['constitType'] == 'tc': - return 'subresjesgscIS' if recoDict['trkopt'] == 'ftf' else 'subjesIS' - elif recoDict['constitType'] == 'pf': - return 'subresjesgscIS' + if recoDict['recoAlg'] == 'a4': + if recoDict['constitType'] == 'tc': + return 'subresjesgscIS' if recoDict['trkopt'] == 'ftf' else 'subjesIS' + elif recoDict['constitType'] == 'pf': + return 'subresjesgscIS' + elif recoDict['recoAlg'] == 'a10': + return 'subjes' + elif recoDict['recoAlg'] == 'a10t': + return 'jes' + elif recoDict['recoAlg'] == 'a10r': + return 'subjesIS' # calibration for the small-R jets used to reconstruct the reclustered jets + else: + raise RuntimeError('No default calibration is defined for %s' % recoDict['recoAlg']) recoKeys = ['recoAlg','constitType','clusterCalib','constitMod','jetCalib','trkopt','trkpresel']