Merge branch '22.0-Implementation_SV1Flip_part2' into '22.0'

BTaggingSV1Flip_forHL

See merge request atlas/athena!53627

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

@@ -58,6 +58,11 @@ def BTagToolCfg(ConfigFlags, TaggerList, PrimaryVertexCollectionName="", scheme
           from JetTagTools.SV1TagConfig import SV1TagCfg
           sv1tool = acc.popToolsAndMerge(SV1TagCfg(ConfigFlags, 'SV1Tag', scheme))
           tagToolList.append(sv1tool)
+      
+      if 'SV1Flip' in TaggerList:
+          from JetTagTools.SV1TagConfig import SV1TagCfg
+          sv1fliptool = acc.popToolsAndMerge(SV1TagCfg(ConfigFlags, 'SV1FlipTag', scheme))
+          tagToolList.append(sv1fliptool)
 
       if 'JetFitterNN' in TaggerList:
           from JetTagTools.JetFitterTagConfig import JetFitterTagCfg

PhysicsAnalysis/JetTagging/JetTagConfig/python/BTaggingConfigFlags.py

@@ -34,7 +34,7 @@ def getTaggerList(flags):
     # NOTE: MV2c10 is deprecated but something in trigger is asking
     # for it... maybe online monitoring?
     base = ['IP2D','IP3D','SV1','JetFitterNN']
-    flip = ['IP2DNeg', 'IP3DNeg','IP2DFlip', 'IP3DFlip']
+    flip = ['IP2DNeg', 'IP3DNeg','IP2DFlip', 'IP3DFlip','SV1Flip']
     if flags.BTagging.RunFlipTaggers:
         return base + flip
     return base

PhysicsAnalysis/JetTagging/JetTagTools/python/SV1TagConfig.py

@@ -23,7 +23,10 @@ def SV1TagCfg( flags, name = 'SV1Tag', scheme = '', useBTagFlagsDefaults = True,
     output: The actual tool."""    
     acc = ComponentAccumulator()
     options['name'] = name
-    options['xAODBaseName'] = 'SV1'
+    if 'Flip' in name:
+        options['xAODBaseName'] = 'SV1Flip'
+    else:
+        options['xAODBaseName'] = 'SV1'
     if useBTagFlagsDefaults:
         likelihood = acc.popToolsAndMerge(NewLikelihoodToolCfg(flags, 'SV1NewLikelihoodTool', 'SV1', scheme))
         defaults = { 'Runmodus'                         : flags.BTagging.RunModus,

PhysicsAnalysis/JetTagging/JetTagTools/src/SVTag.cxx

 /*
-  Copyright (C) 2002-2019 CERN for the benefit of the ATLAS collaboration
+  Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
 */
 
 /***************************************************************************
@@ -303,6 +303,7 @@ namespace Analysis
 	BTag.setVariable<float>(m_xAODBaseName, "normdist", distnrm);
 	if (m_xAODBaseName.find("SV1")!=std::string::npos) {
 	  BTag.setVariable<float>(m_xAODBaseName, "significance3d", distnrm);
+	  BTag.setVariable<float>(m_xAODBaseName, "correctSignificance3d", distnrmCorr);
 	  BTag.setVariable<float>(m_xAODBaseName, "deltaR", drJPVSV);
 	  BTag.setVariable<float>(m_xAODBaseName, "Lxy", Lxy);
 	  BTag.setVariable<float>(m_xAODBaseName, "L3d", L3d);