diff --git a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py index b06e2c961ab3f66ac996cb4c2a16494c90883fef..349633428984459e00c69ebb4e42d032e4c731ef 100644 --- a/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py +++ b/Reconstruction/Jet/JetRecConfig/python/JetRecConfig.py @@ -154,7 +154,7 @@ def resolveDependencies(jetdef): # Accumulate prerequisites of the ghost-associated types jetlog.info(" Full list of ghosts: ") - for ghostdef in sorted(list(ghostdefs)): + for ghostdef in sorted(list(ghostdefs), key=lambda g: g.inputtype): jetlog.info(" " + str(ghostdef)) gprereqs = getGhostPrereqs(ghostdef) prereqdict["input"].update( [req.split(':',1)[1] for req in gprereqs] ) @@ -263,7 +263,7 @@ def JetInputCfg(inputdeps, configFlags, sequenceName): jetlog.debug("Preparing Constit Mods for label {0} from {1}".format(constit.label,constit.inputname)) # May need to generate constituent modifier sequences to # produce the input collection - import ConstModHelpers + from . import ConstModHelpers constitalg = ConstModHelpers.getConstitModAlg(constit) if constitalg: components.addEventAlgo(constitalg) diff --git a/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py b/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py index 4db5a37a93f12e50b8547684519447d802cfe6ee..a79186d6bac83c1b753cc137be7cfd2989f8155a 100644 --- a/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py +++ b/Reconstruction/Jet/JetRecConfig/python/StandardJetDefs.py @@ -1,4 +1,4 @@ -# Copyright (C) 2002-2018 CERN for the benefit of the ATLAS collaboration +# Copyright (C) 2002-2020 CERN for the benefit of the ATLAS collaboration ######################################################################## # # @@ -17,7 +17,7 @@ ######################################################################## # Typical jet constituents -from JetDefinition import xAODType, JetConstit +from .JetDefinition import xAODType, JetConstit from copy import deepcopy # Topoclusters with origin correction. @@ -53,7 +53,7 @@ TruthWZ = JetConstit(xAODType.TruthParticle,["NoWZ"]) # Typical jet algorithm definitions # Filter pts, ghost lists and modifier lists can be updated by the user, # though there is some risk of overwriting... -from JetDefinition import JetDefinition +from .JetDefinition import JetDefinition # Standard small-radius (0.4) AntiKt jets AntiKt4LCTopo = JetDefinition("AntiKt",0.4,LCTopoOrigin)