Merge branch 'fix-iptag-bug' into 'master'

Fix for ATLASRECTS-5741: remove old taggers

See merge request atlas/athena!37860

PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTaggingConfiguration_IP3DTag.py

@@ -77,7 +77,6 @@ def toolIP3DTag(name, useBTagFlagsDefaults = True, **options):
         trackGradeFactory= toolIP3DDetailedTrackGradeFactory('IP3DDetailedTrackGradeFactory')
         trackSelectorTool = toolIP3DTrackSelector('IP3DTrackSelector')
         inDetTrackSelectionTool = toolInDetTrackSelector('InDetTrackSelector')
-        trackVertexAssociationTool = toolSpecialTrackAssociator('SpecialTrackAssociator')
         likelihood = toolIP3DNewLikelihoodTool('IP3DNewLikelihoodTool')
         defaults = { 'OutputLevel'                      : BTaggingFlags.OutputLevel,
                      'Runmodus'                         : BTaggingFlags.Runmodus,
@@ -103,7 +102,6 @@ def toolIP3DTag(name, useBTagFlagsDefaults = True, **options):
                      'SVForIPTool'                      : svForIPTool,
                      'trackGradeFactory'                : trackGradeFactory,
                      'TrackToVertexIPEstimator'         : trackToVertexIPEstimator,
-                     'TrackVertexAssociationTool'       : trackVertexAssociationTool,
                      }
         for option in defaults:
             options.setdefault(option, defaults[option])

PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/share/btaggingAlgs.py

@@ -15,7 +15,7 @@ AddressRemappingSvc = AddressRemappingSvc("AddressRemappingSvc")
 AddressRemappingSvc.TypeKeyRenameMaps += ['xAOD::JetAuxContainer#AntiKt4EMTopoJets.btaggingLink->AntiKt4EMTopoJets.oldbtaggingLink']
 svcMgr+= AddressRemappingSvc
 
-taggerList = ['IP2D', 'IP3D', 'MultiSVbb1',  'MultiSVbb2', 'SV1', 'JetFitterNN', 'SoftMu', 'MV2c10', 'MV2rmu', 'MV2r', 'MV2c100', 'MV2cl100' , 'DL1', 'DL1r', 'DL1rmu','DL1mu', 'RNNIP']
+taggerList = ['IP2D', 'IP3D', 'SV1', 'JetFitterNN', 'MV2c10']
 #JetVertexCharge disable ATLASRECTS-4506
 btagalg = BTagConf.setupJetBTaggerAlg(JetCollection="AntiKt4EMTopoJets", TaggerList=taggerList)