Add btagging of AntiKtVR30Rmax4Rmin02PV0TrackJets VR jets in DAOD_PHYSVAL...

Add btagging of AntiKtVR30Rmax4Rmin02PV0TrackJets VR jets in DAOD_PHYSVAL derivation (using update/fix in ATLJETMET-1326 from Jet/Met group) + allow mutiple jet collections btagging (PFlow and VR)

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/FullListOfSmartContainers.py

@@ -70,8 +70,9 @@ FullListOfSmartContainers = [
    "BTagging_AntiKt4EMTopo_201810",
    "BTagging_AntiKt4EMPFlow_201810",
    "BTagging_AntiKt4EMPFlow_201903",
-   'BTagging_AntiKt4EMPFlow',
-   'BTagging_AntiKt4EMTopo',
+   "BTagging_AntiKt4EMPFlow",
+   "BTagging_AntiKt4EMTopo",
+   "BTagging_AntiKtVR30Rmax4Rmin02Track",
    "BTagging_AntiKtVR30Rmax4Rmin02Track_201810",
    "BTagging_AntiKtVR30Rmax4Rmin02Track_201810GhostTag",
    "BTagging_AntiKtVR30Rmax4Rmin02Track_201810_expert",

PhysicsAnalysis/DerivationFramework/DerivationFrameworkCore/python/SlimmingHelper.py

@@ -569,6 +569,9 @@ class SlimmingHelper:
                 elif collectionName=="BTagging_AntiKt4EMTopo":
                         from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
                         items.extend(BTaggingStandardContent("AntiKt4EMTopoJets"))
+                elif collectionName=="BTagging_AntiKtVR30Rmax4Rmin02Track":
+                        from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
+                        items.extend(BTaggingStandardContent("AntiKtVR30Rmax4Rmin02PV0TrackJets"))
                 elif collectionName=="BTagging_AntiKt2Track":
                         from DerivationFrameworkFlavourTag.BTaggingContent import BTaggingStandardContent
                         items.extend(BTaggingStandardContent("AntiKt2PV0TrackJets"))

PhysicsAnalysis/DerivationFramework/DerivationFrameworkFlavourTag/python/FtagRun3DerivationConfig.py

@@ -86,8 +86,12 @@ def getFtagComponent(cfgFlags, jetcol, taggerlist, OutputLevel=WARNING):
             'BTagging/201903/rnnip/antikt4empflow/network.json',
             'BTagging/201903/dl1r/antikt4empflow/network.json',
             'BTagging/201903/dl1/antikt4empflow/network.json',
+        ],
+        'AntiKtVR30Rmax4Rmin02Track': [
+            'BTagging/201903/rnnip/antiktvr30rmax4rmin02track/network.json',
+            'BTagging/201903/dl1r/antiktvr30rmax4rmin02track/network.json',
+            'BTagging/201903/dl1/antiktvr30rmax4rmin02track/network.json',
         ]
-
     }
 
     acc.merge(BTagTrackAugmenterAlgCfg(cfgFlags))

PhysicsAnalysis/DerivationFramework/DerivationFrameworkPhysicsValidation/share/PHYSVAL.py

@@ -162,8 +162,7 @@ SeqPHYSVAL += CfgMgr.DerivationFramework__DerivationKernel("PHYSVALKernel")
 #====================================================================
 
 from DerivationFrameworkFlavourTag.FtagRun3DerivationConfig import FtagJetCollections
-FtagJetCollections(['AntiKt4EMPFlowJets'],SeqPHYSVAL)
-
+FtagJetCollections(['AntiKt4EMPFlowJets','AntiKtVR30Rmax4Rmin02TrackJets'],SeqPHYSVAL)
 
 #====================================================================
 # TC-LVT Vertices 
@@ -189,6 +188,7 @@ PHYSVALSlimmingHelper.SmartCollections = ["Electrons",
                                        "AntiKt4EMPFlowJets",
                                        "BTagging_AntiKt4EMPFlow",
                                        "BTagging_AntiKt4EMTopo",
+                                       "BTagging_AntiKtVR30Rmax4Rmin02Track",
                                        "MET_Reference_AntiKt4EMTopo",
                                        "MET_Reference_AntiKt4EMPFlow",
                                        "TauJets",
@@ -208,6 +208,7 @@ PHYSVALSlimmingHelper.AllVariables =  ["Electrons", "ForwardElectrons",
                                        "AntiKt4EMPFlowJets",
                                        "BTagging_AntiKt4EMPFlow",
                                        "BTagging_AntiKt4EMTopo",
+                                       "BTagging_AntiKtVR30Rmax4Rmin02Track",
                                        "MET_Reference_AntiKt4EMTopo",
                                        "MET_Reference_AntiKt4EMPFlow",
                                        "MET_Reference_AntiKt4LCTopo",
@@ -274,7 +275,8 @@ if DerivationFrameworkIsMonteCarlo:
                                             'TruthPrimaryVertices':'xAOD::TruthVertexContainer','TruthPrimaryVerticesAux':'xAOD::TruthVertexAuxContainer',
                                             'AntiKt10TruthTrimmedPtFrac5SmallR20Jets':'xAOD::JetContainer', 'AntiKt10TruthTrimmedPtFrac5SmallR20JetsAux':'xAOD::JetAuxContainer',
                                             'AntiKt10LCTopoJets':'xAOD::JetContainer', 'AntiKt10LCTopoJetsAux':'xAOD::JetAuxContainer',
-                                            'AntiKt10PV0TrackJets':'xAOD::JetContainer','AntiKt10PV0TrackJetsAux':'xAOD::JetAuxContainer'
+                                            'AntiKt10PV0TrackJets':'xAOD::JetContainer','AntiKt10PV0TrackJetsAux':'xAOD::JetAuxContainer',
+                                            'BTagging_AntiKtVR30Rmax4Rmin02Track':'xAOD::BTaggingContainer','BTagging_AntiKtVR30Rmax4Rmin02TrackAux':'xAOD::BTaggingAuxContainer'   
                                            }
 
    from DerivationFrameworkMCTruth.MCTruthCommon import addTruth3ContentToSlimmerTool

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

@@ -27,7 +27,8 @@ def JetParticleAssociationAlgCfg(ConfigFlags, JetCollection="", ParticleCollecti
                        'coneSizeFitPar3': -1.56387e-05}
 
     # setup the associator
-    options['JetCollectionName'] = jetcol + 'Jets'
+    #options['JetCollectionName'] = jetcol + 'Jets'
+    options['JetCollectionName'] = jetcol.replace('Track', 'PV0Track') + 'Jets' #AD
     options['TrackParticleCollectionName'] = partcol
     options['TrackToJetAssociatorName'] = jetcol + 'Jets.' + AssociationName
     options['TrackToJetAssociator'] = acc.popToolsAndMerge(BTagTrackToJetAssociatorCfg(ConfigFlags, AssociationName, options = optionAssoc))