From bf24fb1edf30aea2fa478ed7021055a28810c48e Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Fri, 28 Jan 2022 17:23:47 +0100 Subject: [PATCH 01/10] SV1Flip implementation - first part, up to JetBTagggingAlg --- .../python/FtagRun3DerivationConfig.py | 2 +- .../BTagging/BTagging/BTagLightSecVertexing.h | 1 + .../BTagging/python/BTagLightSecVertexingConfig.py | 2 ++ .../BTagging/python/InDetVKalVxInJetToolConfig.py | 3 +++ .../BTagging/python/JetSecVertexingAlgConfig.py | 2 ++ .../BTagging/python/JetSecVtxFindingAlgConfig.py | 2 ++ .../BTagging/src/BTagLightSecVertexing.cxx | 12 +++++++----- .../JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx | 4 ++-- 8 files changed, 20 insertions(+), 8 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py index 4ecb3700a81..9b5212e5323 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py @@ -88,7 +88,7 @@ def getFtagComponent(cfgFlags, jetcol, taggerlist, pvCol='PrimaryVertices', Outp SecVertexers = [ 'JetFitter' , 'SV1'] if cfgFlags.BTagging.RunFlipTaggers is True: - SecVertexersFlip = ['JetFitterFlip'] + SecVertexersFlip = ['JetFitterFlip','SV1Flip'] for ele in SecVertexersFlip: SecVertexers.append(ele) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h index 7b14f6c6f12..74d6c151ab1 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h @@ -62,6 +62,7 @@ namespace Analysis std::string m_vxPrimaryName; //Input ReadHandle SG::ReadHandleKey m_VertexCollectionName {this, "vxPrimaryCollectionName", "", "Input primary vertex container"}; Gaudi::Property> m_jetSVLinkName{ this, "JetSecVtxLinkName", "", "Element Link vector form jet to SV container"}; + Gaudi::Property> m_jetSVFlipLinkName{ this, "JetSVFlipVtxLinkName", "", "Element Link vector form jet to SVFlip container"}; SG::ReadDecorHandleKey m_jetJFVtxLinkName{ this, "JetJFVtxLinkName", "", "Element Link vector form jet to JF vertex"}; SG::ReadDecorHandleKey m_jetJFFlipVtxLinkName{ this, "JetJFFlipVtxLinkName", "", "Element Link vector form jet to JF vertexFlip"}; SG::ReadHandleKeyArray m_VxSecVertexInfoNames {this, "BTagVxSecVertexInfoNames", {""}, "Input VxSecVertexInfo containers"}; diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py index ce62a9e321b..785791d9773 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py @@ -21,6 +21,7 @@ def BTagLightSecVtxToolCfg(flags, Name, JetCollection, PrimaryVertexCollectionNa OutputFilesJFVxname = "JFVtx" OutputFilesJFVxFlipname = "JFVtxFlip" OutputFilesSVname = "SecVtx" + OutputFilesSVFlipname = 'SecVtxFlip' VxSecVertexInfoNameList = [] secVtxFinderxAODBaseNameList = [] if TimeStamp: @@ -52,6 +53,7 @@ def BTagLightSecVtxToolCfg(flags, Name, JetCollection, PrimaryVertexCollectionNa if cfgFlags.BTagging.RunFlipTaggers is True: options['JetJFFlipVtxLinkName'] = jetcol + '.' + OutputFilesJFVxFlipname + options['JetSVFlipVtxLinkName'] = jetcol + '.' + OutputFilesSVFlipname #options.setdefault('MSVVariableFactory', varFactory) options['name'] = Name+TimeStamp diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py index 4b04db514ce..5400b02e3a9 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py @@ -33,6 +33,9 @@ def InDetVKalVxInJetToolCfg(ConfigFlags, name, MSV = False, useBTagFlagsDefaults defaults = { 'ExistIBL' : geoFlags.isIBL(), } + if 'Flip' in name: + defaults['getNegativeTag'] = True + print(f"defaults (Test): {defaults}") #(AB) this is a test printout for option in defaults: options.setdefault(option, defaults[option]) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py index a5258cd97c4..6d69b361f62 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py @@ -23,6 +23,8 @@ def JetSecVertexingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, TrackC JetSVLink = 'JFVtxFlip' if SVFinder == 'SV1': JetSVLink = 'SecVtx' + if SVFinder == 'SV1Flip': + JetSVLink = 'SecVtxFlip' if SVFinder == 'MSV': JetSVLink = 'MSecVtx' # Maybe no used diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py index 617344a2376..f74c69dddfe 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py @@ -24,6 +24,8 @@ def JetSecVtxFindingAlgCfg(ConfigFlags, JetCollection, PrimaryVertexCollectionNa secVtxFinder = acc.popToolsAndMerge(InDetImprovedJetFitterVxFinderCfg(ConfigFlags, 'JFVxFinder', 'FLIP_SIGN')) elif SVFinder == 'SV1': secVtxFinder = acc.popToolsAndMerge(InDetVKalVxInJetToolCfg(ConfigFlags, "IDVKalVxInJet")) + elif SVFinder == 'SV1Flip': + secVtxFinder = acc.popToolsAndMerge(InDetVKalVxInJetToolCfg(ConfigFlags, "IDVKalVxInJetFlip")) elif SVFinder == 'MSV': secVtxFinder = acc.popToolsAndMerge(InDetVKalVxInJetToolCfg(ConfigFlags, "IDVKalMultiVxInJet", MSV = True)) else: diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx index 9768f38ea95..28958720323 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx @@ -75,6 +75,7 @@ namespace Analysis { // by job configuration. ATH_CHECK( m_VertexCollectionName.initialize() ); ATH_CHECK( m_jetSVLinkName.initialize() ); + ATH_CHECK( m_jetSVFlipLinkName.initialize(!m_jetSVFlipLinkName.empty()) ); ATH_CHECK( m_jetJFVtxLinkName.initialize() ); ATH_CHECK( m_jetJFFlipVtxLinkName.initialize(!m_jetJFFlipVtxLinkName.empty())); ATH_CHECK( m_VxSecVertexInfoNames.initialize() ); @@ -113,8 +114,9 @@ namespace Analysis { const xAOD::TrackParticleContainer* theTrackParticleContainer, std::string basename) const { - - SG::ReadDecorHandle > > h_jetSVLinkName (m_jetSVLinkName); + const auto& key = basename.find("Flip")!=std::string::npos ? m_jetSVFlipLinkName : m_jetSVLinkName; + SG::ReadDecorHandle > > h_jetSVLinkName (key); + std::vector< ElementLink< xAOD::VertexContainer > > SVertexLinks; if (myVertexInfoVKal) { if (!h_jetSVLinkName.isAvailable()) { @@ -156,7 +158,7 @@ namespace Analysis { newBTag->setVariable(basename, "energyTrkInJet", energyTrk); newBTag->setVariable(basename, "dstToMatLay", dsttomatlayer); - if("SV1" == basename){ + if("SV1" == basename || "SV1Flip" == basename){ newBTag->setTaggerInfo(mass, xAOD::BTagInfo::SV1_masssvx); newBTag->setTaggerInfo(energyfrc, xAOD::BTagInfo::SV1_efracsvx); newBTag->setTaggerInfo(n2trk, xAOD::BTagInfo::SV1_N2Tpair); @@ -395,7 +397,7 @@ namespace Analysis { if(tracksInJet.size()==0){ ATH_MSG_DEBUG("#BTAG# no tracks associated to the jet. Set some with the track selection tool " << trackname << " for VertexFinderxAODBaseName "<< basename); - if("SV1" == basename){ + if("SV1" == basename ||"SV1Flip" == basename ){ std::vector > TrkList; (*btagIter)->setSV1_TrackParticleLinks(TrkList); std::vector > badtrackEL; @@ -426,7 +428,7 @@ namespace Analysis { theTrackParticleContainer = (*itEL).getStorableObjectPointer(); } - if (basename == "SV1") { + if (basename == "SV1" || basename == "SV1Flip") { const Trk::VxSecVKalVertexInfo* myVertexInfoVKal = dynamic_cast(myVertexInfo); ATH_MSG_DEBUG("#BTAG# Found valid VKalVertexInfo information: " << infoCont.key()); StatusCode sc = fillVkalVariables(**jetIter, *btagIter, myVertexInfoVKal, theTrackParticleContainer, basename); diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx index 6d1770d5e7f..daf9b927c99 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx @@ -72,7 +72,7 @@ namespace Analysis { ATH_CHECK( m_TrackCollectionName.initialize() ); ATH_CHECK( m_VxSecVertexInfoName.initialize() ); ATH_CHECK( m_VertexCollectionName.initialize() ); - if ((m_secVertexFinderBaseName == "SV1") || (m_secVertexFinderBaseName == "MSV")) ATH_CHECK( m_BTagSVCollectionName.initialize() ); + if ((m_secVertexFinderBaseName == "SV1") || (m_secVertexFinderBaseName == "SV1Flip")|| (m_secVertexFinderBaseName == "MSV")) ATH_CHECK( m_BTagSVCollectionName.initialize() ); if ((m_secVertexFinderBaseName == "JetFitter") || (m_secVertexFinderBaseName == "JetFitterFlip")) ATH_CHECK( m_BTagJFVtxCollectionName.initialize() ); ATH_CHECK( m_jetSVLinkName.initialize() ); @@ -111,7 +111,7 @@ namespace Analysis { } /* Record the BTagging Secondary Vertex output container */ - if ((basename == "SV1") || (basename == "MSV")) { + if ((basename == "SV1") ||(basename == "SV1Flip") || (basename == "MSV")) { ATH_MSG_DEBUG("#BTAG# Record the BTagging Secondary Vertex output container"); h_BTagSVCollectionName = SG::WriteHandle(m_BTagSVCollectionName); ATH_CHECK( h_BTagSVCollectionName.record(std::make_unique(), -- GitLab From 3d2bb2e4d6781bade3df847d8568fe748b5c7883 Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Fri, 28 Jan 2022 17:50:54 +0100 Subject: [PATCH 02/10] Fix usage of initialize() function --- .../JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx index 28958720323..01354b9b3b8 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx @@ -75,7 +75,8 @@ namespace Analysis { // by job configuration. ATH_CHECK( m_VertexCollectionName.initialize() ); ATH_CHECK( m_jetSVLinkName.initialize() ); - ATH_CHECK( m_jetSVFlipLinkName.initialize(!m_jetSVFlipLinkName.empty()) ); + //ATH_CHECK( m_jetSVFlipLinkName.initialize(!m_jetSVFlipLinkName.empty()) ); + if(!m_jetSVFlipLinkName.empty()) ATH_CHECK( m_jetSVFlipLinkName.initialize() ); ATH_CHECK( m_jetJFVtxLinkName.initialize() ); ATH_CHECK( m_jetJFFlipVtxLinkName.initialize(!m_jetJFFlipVtxLinkName.empty())); ATH_CHECK( m_VxSecVertexInfoNames.initialize() ); -- GitLab From 70b716ca5509b5d9f288d6dc70f10119ddc4b361 Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Tue, 8 Feb 2022 14:24:38 +0100 Subject: [PATCH 03/10] Implemented comments/suggestions by Dan & Valerio --- .../JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h | 4 ++-- .../BTagging/python/BTagLightSecVertexingConfig.py | 2 +- .../JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h index 74d6c151ab1..8f81343bb4e 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/BTagLightSecVertexing.h @@ -61,8 +61,8 @@ namespace Analysis std::string m_vxPrimaryName; //Input ReadHandle SG::ReadHandleKey m_VertexCollectionName {this, "vxPrimaryCollectionName", "", "Input primary vertex container"}; - Gaudi::Property> m_jetSVLinkName{ this, "JetSecVtxLinkName", "", "Element Link vector form jet to SV container"}; - Gaudi::Property> m_jetSVFlipLinkName{ this, "JetSVFlipVtxLinkName", "", "Element Link vector form jet to SVFlip container"}; + SG::ReadDecorHandleKey m_jetSVLinkName{ this, "JetSecVtxLinkName", "", "Element Link vector form jet to SV container"}; + SG::ReadDecorHandleKey m_jetSVFlipLinkName{ this, "JetSecVtxFlipLinkName", "", "Element Link vector form jet to SVFlip container"}; SG::ReadDecorHandleKey m_jetJFVtxLinkName{ this, "JetJFVtxLinkName", "", "Element Link vector form jet to JF vertex"}; SG::ReadDecorHandleKey m_jetJFFlipVtxLinkName{ this, "JetJFFlipVtxLinkName", "", "Element Link vector form jet to JF vertexFlip"}; SG::ReadHandleKeyArray m_VxSecVertexInfoNames {this, "BTagVxSecVertexInfoNames", {""}, "Input VxSecVertexInfo containers"}; diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py index 785791d9773..486ed529c65 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py @@ -53,7 +53,7 @@ def BTagLightSecVtxToolCfg(flags, Name, JetCollection, PrimaryVertexCollectionNa if cfgFlags.BTagging.RunFlipTaggers is True: options['JetJFFlipVtxLinkName'] = jetcol + '.' + OutputFilesJFVxFlipname - options['JetSVFlipVtxLinkName'] = jetcol + '.' + OutputFilesSVFlipname + options['JetSecVtxFlipLinkName'] = jetcol + '.' + OutputFilesSVFlipname #options.setdefault('MSVVariableFactory', varFactory) options['name'] = Name+TimeStamp diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx index 01354b9b3b8..97db5b993e2 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagLightSecVertexing.cxx @@ -75,8 +75,7 @@ namespace Analysis { // by job configuration. ATH_CHECK( m_VertexCollectionName.initialize() ); ATH_CHECK( m_jetSVLinkName.initialize() ); - //ATH_CHECK( m_jetSVFlipLinkName.initialize(!m_jetSVFlipLinkName.empty()) ); - if(!m_jetSVFlipLinkName.empty()) ATH_CHECK( m_jetSVFlipLinkName.initialize() ); + ATH_CHECK( m_jetSVFlipLinkName.initialize(!m_jetSVFlipLinkName.empty()) ); ATH_CHECK( m_jetJFVtxLinkName.initialize() ); ATH_CHECK( m_jetJFFlipVtxLinkName.initialize(!m_jetJFFlipVtxLinkName.empty())); ATH_CHECK( m_VxSecVertexInfoNames.initialize() ); @@ -159,7 +158,7 @@ namespace Analysis { newBTag->setVariable(basename, "energyTrkInJet", energyTrk); newBTag->setVariable(basename, "dstToMatLay", dsttomatlayer); - if("SV1" == basename || "SV1Flip" == basename){ + if("SV1" == basename){ newBTag->setTaggerInfo(mass, xAOD::BTagInfo::SV1_masssvx); newBTag->setTaggerInfo(energyfrc, xAOD::BTagInfo::SV1_efracsvx); newBTag->setTaggerInfo(n2trk, xAOD::BTagInfo::SV1_N2Tpair); -- GitLab From 4912b0677aac7631761644c45ff08fc870af75cb Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Tue, 8 Feb 2022 15:10:24 +0100 Subject: [PATCH 04/10] Cleaning up issue pointed out in ATLASRECTS-6635 --- .../JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py | 5 +++-- .../JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py | 4 ++-- .../JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py index 5400b02e3a9..73d2312907c 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py @@ -6,7 +6,8 @@ from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags from JetTagTools.InDetEtaDependentCutsSvcConfig import IDEtaDependentCuts_SV1_SvcCfg # import the InDetVKalVxInJetTool configurable -InDet__InDetVKalVxInJetTool=CompFactory.InDet.InDetVKalVxInJetTool +#InDet__InDetVKalVxInJetTool=CompFactory.InDet.InDetVKalVxInJetTool +#(AB) ATLASRECTS-6635 def InDetVKalVxInJetToolCfg(ConfigFlags, name, MSV = False, useBTagFlagsDefaults = True, **options): """Sets up a InDetVKalVxInJetTool tool and returns it. @@ -46,6 +47,6 @@ def InDetVKalVxInJetToolCfg(ConfigFlags, name, MSV = False, useBTagFlagsDefaults options.setdefault("useITkMaterialRejection", True) options['name'] = name - acc.setPrivateTools(InDet__InDetVKalVxInJetTool(**options)) + acc.setPrivateTools(CompFactory.InDet.InDetVKalVxInJetTool(**options)) return acc diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py index 6d69b361f62..670fd65c2a0 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py @@ -4,7 +4,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory from BTagging.MSVVariablesFactoryConfig import MSVVariablesFactoryCfg -Analysis__JetSecVertexingAlg=CompFactory.Analysis.JetSecVertexingAlg +#Analysis__JetSecVertexingAlg=CompFactory.Analysis.JetSecVertexingAlg def JetSecVertexingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, TrackCollection, PrimaryVertexCollectionName="", SVFinder="", **options): """Adds a SecVtxTool instance and registers it. @@ -43,6 +43,6 @@ def JetSecVertexingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, TrackC options['name'] = (JetCollection + '_' + SVFinder + '_secvtx').lower() # -- create the association algorithm - acc.addEventAlgo(Analysis__JetSecVertexingAlg(**options)) + acc.addEventAlgo(CompFactory.Analysis.JetSecVertexingAlg(**options)) return acc diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py index f74c69dddfe..486eebba99b 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py @@ -5,7 +5,7 @@ from AthenaConfiguration.ComponentFactory import CompFactory from BTagging.InDetImprovedJetFitterVxFinderConfig import InDetImprovedJetFitterVxFinderCfg from BTagging.InDetVKalVxInJetToolConfig import InDetVKalVxInJetToolCfg -Analysis__JetSecVtxFindingAlg=CompFactory.Analysis.JetSecVtxFindingAlg +#Analysis__JetSecVtxFindingAlg=CompFactory.Analysis.JetSecVtxFindingAlg def JetSecVtxFindingAlgCfg(ConfigFlags, JetCollection, PrimaryVertexCollectionName="", SVFinder="", TracksToTag="", **options): """Adds a SecVtxTool instance and registers it. @@ -40,6 +40,6 @@ def JetSecVtxFindingAlgCfg(ConfigFlags, JetCollection, PrimaryVertexCollectionNa options['name'] = (JetCollection + '_' + SVFinder + '_secvtxfinding').lower() # -- create the association algorithm - acc.addEventAlgo(Analysis__JetSecVtxFindingAlg(**options)) + acc.addEventAlgo(CompFactory.Analysis.JetSecVtxFindingAlg(**options)) return acc -- GitLab From 9e002201c978ccedcc67c98a1605c1806d0da243 Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Tue, 8 Feb 2022 16:59:02 +0100 Subject: [PATCH 05/10] Some code cleaning, addition of container in PHYSVAL BTagging_AntiKt4EMPFlowSecVtxFlip --- .../DerivationFrameworkPhysicsValidation/share/PHYSVAL.py | 2 ++ .../JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py | 5 +---- .../JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py | 1 - .../JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py | 1 - 4 files changed, 3 insertions(+), 6 deletions(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py index 09a3ac54897..a389d414e74 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py @@ -233,6 +233,7 @@ PHYSVALSlimmingHelper.AllVariables = ["EventInfo", "BTagging_AntiKt4EMPFlowJFVtx", "BTagging_AntiKt4EMPFlowJFVtxFlip", #Flip version of JetFitter "BTagging_AntiKt4EMPFlowSecVtx", + "BTagging_AntiKt4EMPFlowSecVtxFlip", #Flip version of SV1 "MET_Reference_AntiKt4EMTopo", "MET_Reference_AntiKt4EMPFlow", "MET_Reference_AntiKt4LCTopo", @@ -312,6 +313,7 @@ if DerivationFrameworkIsMonteCarlo: 'CHSChargedParticleFlowObjects': 'xAOD::FlowElementContainer', 'CHSChargedParticleFlowObjectsAux':'xAOD::ShallowAuxContainer', 'CHSNeutralParticleFlowObjects': 'xAOD::FlowElementContainer', 'CHSNeutralParticleFlowObjectsAux':'xAOD::ShallowAuxContainer', 'BTagging_AntiKt4EMPFlowJFVtxFlip':'xAOD::BTagVertexContainer','BTagging_AntiKt4EMPFlowJFVtxFlipAux':'xAOD::BTagVertexAuxContainer',#For Flip version of JetFitter + 'BTagging_AntiKt4EMPFlowSecVtxFlip':'xAOD::VertexContainer','BTagging_AntiKt4EMPFlowSecVtxFlipAux':'xAOD::VertexAuxContainer', } from DerivationFrameworkMCTruth.MCTruthCommon import addTruth3ContentToSlimmerTool diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py index 73d2312907c..5d95abb9da9 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/InDetVKalVxInJetToolConfig.py @@ -5,9 +5,6 @@ from AthenaConfiguration.ComponentFactory import CompFactory from AtlasGeoModel.InDetGMJobProperties import InDetGeometryFlags as geoFlags from JetTagTools.InDetEtaDependentCutsSvcConfig import IDEtaDependentCuts_SV1_SvcCfg -# import the InDetVKalVxInJetTool configurable -#InDet__InDetVKalVxInJetTool=CompFactory.InDet.InDetVKalVxInJetTool -#(AB) ATLASRECTS-6635 def InDetVKalVxInJetToolCfg(ConfigFlags, name, MSV = False, useBTagFlagsDefaults = True, **options): """Sets up a InDetVKalVxInJetTool tool and returns it. @@ -36,7 +33,7 @@ def InDetVKalVxInJetToolCfg(ConfigFlags, name, MSV = False, useBTagFlagsDefaults } if 'Flip' in name: defaults['getNegativeTag'] = True - print(f"defaults (Test): {defaults}") #(AB) this is a test printout + for option in defaults: options.setdefault(option, defaults[option]) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py index 670fd65c2a0..59b6c083728 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVertexingAlgConfig.py @@ -4,7 +4,6 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory from BTagging.MSVVariablesFactoryConfig import MSVVariablesFactoryCfg -#Analysis__JetSecVertexingAlg=CompFactory.Analysis.JetSecVertexingAlg def JetSecVertexingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, TrackCollection, PrimaryVertexCollectionName="", SVFinder="", **options): """Adds a SecVtxTool instance and registers it. diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py index 486eebba99b..bd6022ab79e 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetSecVtxFindingAlgConfig.py @@ -5,7 +5,6 @@ from AthenaConfiguration.ComponentFactory import CompFactory from BTagging.InDetImprovedJetFitterVxFinderConfig import InDetImprovedJetFitterVxFinderCfg from BTagging.InDetVKalVxInJetToolConfig import InDetVKalVxInJetToolCfg -#Analysis__JetSecVtxFindingAlg=CompFactory.Analysis.JetSecVtxFindingAlg def JetSecVtxFindingAlgCfg(ConfigFlags, JetCollection, PrimaryVertexCollectionName="", SVFinder="", TracksToTag="", **options): """Adds a SecVtxTool instance and registers it. -- GitLab From 693843b9dd675d2aa21e4a16d64403897444a643 Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Wed, 9 Feb 2022 18:09:50 +0100 Subject: [PATCH 06/10] Implement flip SV container definition+initialization in JetBTaggingAlg --- .../JetTagging/JetTagAlgs/BTagging/BTagging/JetBTaggingAlg.h | 4 ++++ .../JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py | 5 +++++ .../JetTagging/JetTagAlgs/BTagging/src/JetBTaggingAlg.cxx | 3 +++ 3 files changed, 12 insertions(+) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/JetBTaggingAlg.h b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/JetBTaggingAlg.h index 6082bca64ee..e6bdb5daea8 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/JetBTaggingAlg.h +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/BTagging/JetBTaggingAlg.h @@ -53,6 +53,10 @@ class JetBTaggingAlg: //SG::ReadHandleKey m_VertexCollectionName {this, "vxPrimaryCollectionName", "", "Input primary vertex container"}; SG::ReadHandleKey m_BTagSVCollectionName {this, "BTagSVCollectionName", "", "Input BTagging secondary vertex container"}; SG::ReadHandleKey m_BTagJFVtxCollectionName {this, "BTagJFVtxCollectionName", "", "Input BTagging Jet Fitter container"}; + //SecVertexer collection names for the flip taggers + SG::ReadHandleKey m_BTagSVFlipCollectionName {this, "BTagSVFlipCollectionName", "", "Input Flip BTagging secondary vertex container"}; + SG::ReadHandleKey m_BTagJFVtxFlipCollectionName {this, "BTagJFVtxFlipCollectionName", "", "Input Flip BTagging Jet Fitter container"}; + // Read handle for conditions object to get the field cache SG::ReadCondHandleKey m_fieldCacheCondObjInputKey {this, "AtlasFieldCacheCondObj", "fieldCondObj", "Name of the Magnetic Field conditions object key"}; SG::WriteDecorHandleKey m_jetBTaggingLinkName {this, "BTaggingLinkName", "", "Element link from jet to BTagging container"}; diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py index d30cbf5086d..67e4d16a4d6 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py @@ -4,6 +4,7 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory from BTagging.BTagToolConfig import BTagToolCfg from BTagging.BTagLightSecVertexingConfig import BTagLightSecVtxToolCfg +from AthenaConfiguration.AllConfigFlags import ConfigFlags as cfgFlags # import the JetBTaggingAlg configurable Analysis__JetBTaggingAlg = CompFactory.Analysis.JetBTaggingAlg @@ -26,6 +27,10 @@ def JetBTaggingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, PrimaryVer options['JetCalibrationName'] = JetCollection.replace('Track', 'PV0Track') options['BTagSVCollectionName'] = BTaggingCollection + 'SecVtx' options['BTagJFVtxCollectionName'] = BTaggingCollection + 'JFVtx' + + if cfgFlags.BTagging.RunFlipTaggers is True: + options['BTagSVFlipCollectionName'] = BTaggingCollection + 'SecVtxFlip' + options['BTagJFVtxFlipCollectionName'] = BTaggingCollection + 'JFVtxFlip' options['BTaggingLinkName'] = options['JetCollectionName'] + '.btaggingLink'+TimeStamp if TimeStamp: BTaggingCollection += '_'+TimeStamp diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetBTaggingAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetBTaggingAlg.cxx index ff01c5dbe55..04fd3de60ec 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetBTaggingAlg.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetBTaggingAlg.cxx @@ -59,6 +59,9 @@ namespace Analysis { ATH_CHECK( m_BTaggingCollectionName.initialize() ); ATH_CHECK( m_jetBTaggingLinkName.initialize() ); ATH_CHECK( m_bTagJetDecorLinkName.initialize() ); + + ATH_CHECK( m_BTagSVFlipCollectionName.initialize(!m_BTagSVFlipCollectionName.empty())); + ATH_CHECK( m_BTagJFVtxFlipCollectionName.initialize(!m_BTagJFVtxFlipCollectionName.empty())); // this is a terrible, awful hack -- GitLab From e7c9d01dbf9430b9adde273bc951802d4afee026 Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Thu, 10 Feb 2022 11:26:28 +0100 Subject: [PATCH 07/10] Use predefined config flags, clean an alias in JetBTaggingAlgConfig --- .../BTagging/python/BTagLightSecVertexingConfig.py | 3 +-- .../JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py | 8 ++------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py index 486ed529c65..eb88610eeb7 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/BTagLightSecVertexingConfig.py @@ -4,7 +4,6 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory from JetTagTools.JetFitterVariablesFactoryConfig import JetFitterVariablesFactoryCfg #from BTagging.MSVVariablesFactoryConfig import MSVVariablesFactoryCfg -from AthenaConfiguration.AllConfigFlags import ConfigFlags as cfgFlags def BTagLightSecVtxToolCfg(flags, Name, JetCollection, PrimaryVertexCollectionName="", SecVertexers = [], TimeStamp = "", **options): """Adds a SecVtxTool instance and registers it. @@ -51,7 +50,7 @@ def BTagLightSecVtxToolCfg(flags, Name, JetCollection, PrimaryVertexCollectionNa options['JetSecVtxLinkName'] = jetcol + '.' + OutputFilesSVname options['JetJFVtxLinkName'] = jetcol + '.' + OutputFilesJFVxname - if cfgFlags.BTagging.RunFlipTaggers is True: + if flags.BTagging.RunFlipTaggers is True: options['JetJFFlipVtxLinkName'] = jetcol + '.' + OutputFilesJFVxFlipname options['JetSecVtxFlipLinkName'] = jetcol + '.' + OutputFilesSVFlipname diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py index 67e4d16a4d6..c2f37de8e55 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/python/JetBTaggingAlgConfig.py @@ -4,10 +4,6 @@ from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator from AthenaConfiguration.ComponentFactory import CompFactory from BTagging.BTagToolConfig import BTagToolCfg from BTagging.BTagLightSecVertexingConfig import BTagLightSecVtxToolCfg -from AthenaConfiguration.AllConfigFlags import ConfigFlags as cfgFlags - -# import the JetBTaggingAlg configurable -Analysis__JetBTaggingAlg = CompFactory.Analysis.JetBTaggingAlg def JetBTaggingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, PrimaryVertexCollectionName, TaggerList, SecVertexers, Tracks, Muons, SetupScheme="", TimeStamp = "", **options): @@ -28,7 +24,7 @@ def JetBTaggingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, PrimaryVer options['BTagSVCollectionName'] = BTaggingCollection + 'SecVtx' options['BTagJFVtxCollectionName'] = BTaggingCollection + 'JFVtx' - if cfgFlags.BTagging.RunFlipTaggers is True: + if ConfigFlags.BTagging.RunFlipTaggers is True: options['BTagSVFlipCollectionName'] = BTaggingCollection + 'SecVtxFlip' options['BTagJFVtxFlipCollectionName'] = BTaggingCollection + 'JFVtxFlip' @@ -39,6 +35,6 @@ def JetBTaggingAlgCfg(ConfigFlags, BTaggingCollection, JetCollection, PrimaryVer options['name'] = (options['BTaggingCollectionName'] + "_" + options['JetCollectionName'] + ConfigFlags.BTagging.GeneralToolSuffix).lower() # -- create main BTagging algorithm - acc.addEventAlgo(Analysis__JetBTaggingAlg(**options)) + acc.addEventAlgo(CompFactory.Analysis.JetBTaggingAlg(**options)) return acc -- GitLab From 5aa964cf745bec67c600250bbcb7a94941f84964 Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Thu, 10 Feb 2022 18:33:39 +0100 Subject: [PATCH 08/10] deleted vxTrackAtVertex variable for Flip SV1 tagger as well --- .../DerivationFrameworkPhysicsValidation/share/PHYSVAL.py | 1 + 1 file changed, 1 insertion(+) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py index 880ad14ffc9..3038c694049 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py @@ -237,6 +237,7 @@ StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Medium_VerticesA StaticContent += ["xAOD::VertexContainer#SoftBVrtClusterTool_Loose_Vertices"] StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Loose_VerticesAux." + excludedVertexAuxData] StaticContent += ["xAOD::VertexAuxContainer#BTagging_AntiKt4EMPFlowSecVtxAux.-vxTrackAtVertex"] +StaticContent += ["xAOD::VertexAuxContainer#BTagging_AntiKt4EMPFlowSecVtxFlipAux.-vxTrackAtVertex"] PHYSVALSlimmingHelper.StaticContent = StaticContent -- GitLab From 7591ce57071628c993dfdd544bf3022604353473 Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Fri, 11 Feb 2022 09:47:47 +0100 Subject: [PATCH 09/10] Add if statement to PHYSVAL --- .../DerivationFrameworkPhysicsValidation/share/PHYSVAL.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py index 3038c694049..f668703bf96 100644 --- a/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py +++ b/PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py @@ -28,6 +28,8 @@ from TriggerMenuMT.TriggerAPI.TriggerEnums import TriggerPeriod, TriggerType from DerivationFrameworkTrigger.TriggerMatchingHelper import TriggerMatchingHelper from DerivationFrameworkTrigger.TrigSlimmingHelper import addTrigEDMSetToOutput from TrkDetDescrSvc.AtlasTrackingGeometrySvc import AtlasTrackingGeometrySvc +#add to check whether flip tagger is run +from AthenaConfiguration.AllConfigFlags import ConfigFlags as cfgFlags #==================================================================== # SET UP STREAM @@ -237,7 +239,8 @@ StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Medium_VerticesA StaticContent += ["xAOD::VertexContainer#SoftBVrtClusterTool_Loose_Vertices"] StaticContent += ["xAOD::VertexAuxContainer#SoftBVrtClusterTool_Loose_VerticesAux." + excludedVertexAuxData] StaticContent += ["xAOD::VertexAuxContainer#BTagging_AntiKt4EMPFlowSecVtxAux.-vxTrackAtVertex"] -StaticContent += ["xAOD::VertexAuxContainer#BTagging_AntiKt4EMPFlowSecVtxFlipAux.-vxTrackAtVertex"] +if cfgFlags.BTagging.RunFlipTaggers is True: + StaticContent += ["xAOD::VertexAuxContainer#BTagging_AntiKt4EMPFlowSecVtxFlipAux.-vxTrackAtVertex"] PHYSVALSlimmingHelper.StaticContent = StaticContent -- GitLab From 400f3c57e151cf4b7485e3070f2a87f214c687fd Mon Sep 17 00:00:00 2001 From: Angela Maria Burger Date: Fri, 11 Feb 2022 13:33:26 +0100 Subject: [PATCH 10/10] Adapt JetSecVertexingAlg.cxx to most recent master --- .../JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx | 6 +++--- .../JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx index 02db2592a4b..cf84a640edb 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/BTagSecVertexing.cxx @@ -201,7 +201,7 @@ namespace Analysis { if(tracksInJet.size()==0){ ATH_MSG_DEBUG("#BTAG# no tracks associated to the jet"); - if("SV1" == basename){ + if("SV1" == basename || "SV1Flip" == basename){ std::vector > TrkList; newBTag->setSV1_TrackParticleLinks(TrkList); std::vector > badtrackEL; @@ -402,7 +402,7 @@ namespace Analysis { const std::vector< const xAOD::Vertex*> vecTwoTrkVtx = TwoTrkVtxInJet->getTwoTrackVertice(); int N2TrkVtx = vecTwoTrkVtx.size(); - if("JetFitter" == basename || "JetFitterFlip" == basename ){ + if("JetFitter" == basename ){ newBTag->setTaggerInfo(N2TrkVtx, xAOD::BTagInfo::JetFitter_N2Tpair); } else{ @@ -712,7 +712,7 @@ namespace Analysis { if(tracksInJet.size()==0){ ATH_MSG_DEBUG("#BTAG# no tracks associated to the jet. Set some with the track selection tool " << trackname << " for VertexFinderxAODBaseName "<< basename); - if("SV1" == basename){ + if("SV1" == basename || "SV1Flip" == basename){ std::vector > TrkList; (*btagIter)->setSV1_TrackParticleLinks(TrkList); std::vector > badtrackEL; diff --git a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx index eb5f402a7ab..e58450430ec 100644 --- a/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx +++ b/PhysicsAnalysis/JetTagging/JetTagAlgs/BTagging/src/JetSecVertexingAlg.cxx @@ -196,7 +196,7 @@ namespace Analysis { } } } - else if(basename == "SV1") { //SV1 + else if(basename == "SV1" || basename == "SV1Flip") { //SV1 SG::WriteDecorHandle > > h_jetSVLinkName(m_jetSVLinkName); std::vector< ElementLink< xAOD::VertexContainer > > SVertexLinks; if(myVertexInfo != nullptr) { -- GitLab