diff --git a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py index 4121f35dc331c6f30a82d85d214f0ef271da09b8..ce43bab58ff32e746b39ce67e2fd55604979cc4b 100644 --- a/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py +++ b/Reconstruction/Jet/JetRecConfig/python/ConstModHelpers.py @@ -51,7 +51,7 @@ ConstModConfigs = { "SK": {} } -def getConstitModAlg(constit,suffix="",tvaKey="JetTrackVtxAssociation",vtxKey="PrimaryVertices"): +def getConstitModAlg(constit,suffix="",tvaKey="JetTrackVtxAssoc",vtxKey="PrimaryVertices"): inputtype = constit.basetype # Need to extend to TCC diff --git a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py index eb332bf7503bc020fd486243636a33ed87297f7e..4a73eacb0b4011fa4da70f37ab7080bc209e820d 100755 --- a/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py +++ b/Reconstruction/Jet/JetRecConfig/share/JetRecTestCfg.py @@ -146,7 +146,6 @@ if __name__=="__main__": # Config flags steer the job at various levels from AthenaConfiguration.AllConfigFlags import ConfigFlags - ConfigFlags.Input.isMC = True ConfigFlags.Input.Files = args.filesIn.split(",") # Flags relating to multithreaded execution @@ -172,6 +171,15 @@ if __name__=="__main__": from AthenaPoolCnvSvc.PoolReadConfig import PoolReadCfg cfg.merge(PoolReadCfg(ConfigFlags)) + # Nowadays the jet calibration tool requires the EventInfo + # to be decorated with lumi info, which is not in Run 2 AODs + from LumiBlockComps.LuminosityCondAlgConfig import LuminosityCondAlgCfg + cfg.merge(LuminosityCondAlgCfg(ConfigFlags)) + + from AthenaConfiguration.ComponentFactory import CompFactory + muWriter = CompFactory.LumiBlockMuWriter("LumiBlockMuWriter",LumiDataKey="LuminosityCondData") + cfg.addEventAlgo(muWriter,"AthAlgSeq") + # Add the components from our jet reconstruction job cfg.merge(JetRecTestCfg(jetdefs,ConfigFlags,args)) diff --git a/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh b/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh index 375b5573850e01fcbb1ae3295fda5fff3891c44d..c6bc35229ead9eb70aa6ce4bf4ba6f95a9771843 100755 --- a/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh +++ b/Reconstruction/Jet/JetRecConfig/test/test_JetRecCfg_build.sh @@ -1 +1 @@ -JetRecTestCfg.py -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1 +JetRecTestCfg.py -f /cvmfs/atlas-nightlies.cern.ch/repo/data/data-art/ASG/mc16_13TeV.410501.PowhegPythia8EvtGen_A14_ttbar_hdamp258p75_nonallhad.merge.AOD.e5458_s3126_r9364_r9315/AOD.11182705._000001.pool.root.1 -n 10