Merge branch 'ActivateTaggers' into 'master'

AFT-522: Activate SV1 and JF LH

See merge request atlas/athena!39034

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:

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_")

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',

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)