diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagToolConfig.py index 419cafc735121a3411665c94bef1f3fc66d9a8d4..f07c1bfde0c2b6f70a357877095fe03301edde97 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagToolConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagToolConfig.py @@ -45,7 +45,7 @@ def BTagToolCfg(ConfigFlags, TaggerList, PrimaryVertexCollectionName="", scheme if 'JetFitterNN' in TaggerList: from JetTagTools.JetFitterTagConfig import JetFitterTagCfg - jetfitterNNtool = acc.popToolsAndMerge(JetFitterTagCfg(ConfigFlags, 'JetFitterTagNN', scheme)) + jetfitterNNtool = acc.popToolsAndMerge(JetFitterTagCfg(ConfigFlags, 'JetFitterTagNN', scheme, runNN=ConfigFlags.BTagging.RunJetFitterNN)) tagToolList.append(jetfitterNNtool) if 'SoftMu' in TaggerList: diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfigFlags.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfigFlags.py index ac81f5186b83e919fecd434598bb2e83ef81bb53..05b37f41de5d8376144c5f51c8a8c0389d537fc8 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfigFlags.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfigFlags.py @@ -19,6 +19,9 @@ def createBTaggingConfigFlags(): "InANDNInShared", "PixShared", "SctShared", "InANDNInSplit", "PixSplit", "Good"]) + # Taggers for validation + btagcf.addFlag("BTagging.SaveSV1Probabilities",False) + btagcf.addFlag("BTagging.RunJetFitterNN",False) #Do we really need this in AthConfigFlags? #Comments in BTaggingConfiguration.py btagcf.addFlag("BTagging.OutputFiles.Prefix", "BTagging_") diff --git a/PhysicsAnalysis/JetTagging/JetTagTools/python/SV1TagConfig.py b/PhysicsAnalysis/JetTagging/JetTagTools/python/SV1TagConfig.py index 0595c43f1aa5362d71252a11c0f77e33bea6c1f1..c976e2eef31ccaf98e9127a9534c9f93966afefc 100644 --- a/PhysicsAnalysis/JetTagging/JetTagTools/python/SV1TagConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagTools/python/SV1TagConfig.py @@ -23,7 +23,7 @@ def SV1TagCfg( flags, name = 'SV1Tag', scheme = '', useBTagFlagsDefaults = True, input: name: The name of the tool (should be unique). useBTagFlagsDefaults : Whether to use BTaggingFlags defaults for options that are not specified. **options: Python dictionary with options for the tool. - output: The actual tool.""" + output: The actual tool.""" acc = ComponentAccumulator() options['name'] = name options['xAODBaseName'] = 'SV1' @@ -32,6 +32,7 @@ def SV1TagCfg( flags, name = 'SV1Tag', scheme = '', useBTagFlagsDefaults = True, defaults = { 'Runmodus' : flags.BTagging.RunModus, 'referenceType' : flags.BTagging.ReferenceType, 'jetPtMinRef' : flags.BTagging.JetPtMinRef, + 'SaveProbabilities' : flags.BTagging.SaveSV1Probabilities, 'SVAlgType' : 'SV1', 'jetCollectionList' : [], #used only in reference mode 'SecVxFinderName' : 'SV1', diff --git a/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py b/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py index c1c41170a0d94d3ca13f3b149c4ec7797bf96dd6..674e815952b975aa93e5af1d7e58b1f70a25dcf1 100755 --- a/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py +++ b/Reconstruction/RecExample/RecExCommon/share/CombinedRec_config.py @@ -145,6 +145,9 @@ if jetOK and rec.doBTagging() and DetFlags.ID_on() and DetFlags.Muon_on(): ConfigFlags.Input.Files = jps.AthenaCommonFlags.FilesInput.get_Value() ConfigFlags.IOVDb.GlobalTag=globalflags.ConditionsTag() ConfigFlags.GeoModel.AtlasVersion = jps.Global.DetDescrVersion() + # Additional b-tagging related flags + ConfigFlags.BTagging.SaveSV1Probabilities = True + ConfigFlags.BTagging.RunJetFitterNN = True # Configure BTagging algorithm from BTagging.BTagRun3Config import BTagRecoSplitCfg CAtoGlobalWrapper(BTagRecoSplitCfg, ConfigFlags)