WIP: AFT-509: New b tagging config in reco

Replace old way configuration with new one for BTagging.

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

@@ -149,17 +149,27 @@ def PrepareStandAloneBTagCfg(inputFlags):
 
     return result
 
+def BTagRecoCfg(inputFlags, JetCollection = ['AntiKt4EMTopo'], **kwargs):
+
+    result=ComponentAccumulator()
+
+    taggerList = inputFlags.BTagging.run2TaggersList
+    result.merge(JetTagCalibCfg(inputFlags, TaggerList = taggerList, **kwargs))
+
+    result.merge(JetBTaggerAlgCfg(inputFlags, JetCollection = JetCollection[0], PrimaryVertexCollectionName="PrimaryVertices", TaggerList = taggerList, **kwargs))
+
+    return result
+
 def BTagCfg(inputFlags, JetCollection = [], **kwargs):
 
     #This is monolithic for now. 
     #Once a first complete example runs, this will be split into small modular chunks.
-    #Some such items may be best placed elsewehere (e.g. put magnetic field setup in magnetic field git folder etc)
     result=ComponentAccumulator()
+
     timestamp = kwargs.get('TimeStamp', None)
     if timestamp: del kwargs['TimeStamp']
     splitAlg = kwargs.get('SplitAlg', None)
-    del kwargs['SplitAlg']
-
+    if splitAlg: del kwargs['SplitAlg']
 
     TrainedTaggers = inputFlags.BTagging.run2TaggersList + ['MultiSVbb1','MultiSVbb2']
     result.merge(JetTagCalibCfg(inputFlags, TaggerList = TrainedTaggers, **kwargs))
@@ -198,7 +208,9 @@ def BTagCfg(inputFlags, JetCollection = [], **kwargs):
             secVertexingAndAssociators = {'JetFitter':'BTagTrackToJetAssociator','SV1':'BTagTrackToJetAssociator', 'MSV':'BTagTrackToJetAssociatorBB'}
             result.merge(JetBTaggerSplitAlgsCfg(inputFlags, JetCollection = jet, TaggerList = taggerList, SecVertexingAndAssociators = secVertexingAndAssociators, **kwargs))
         else:
-            result.merge(JetBTaggerAlgCfg(inputFlags, JetCollection = jet, TaggerList = taggerList, **kwargs))
+            if kwargs.get('Release', None):
+              del kwargs['Release']
+            result.merge(JetBTaggerAlgCfg(inputFlags, JetCollection = jet, PrimaryVertexCollectionName="PrimaryVertices", TaggerList = taggerList, **kwargs))
 
     return result
 
@@ -236,8 +248,9 @@ def JetBTaggerSplitAlgsCfg(inputFlags, JetCollection="", TaggerList=[], SecVerte
 
     for assoc in TrackToJetAssociators:
         result.merge(JetParticleAssociationAlgCfg(inputFlags, jet, "InDetTrackParticles", assoc, **kwargs))
-        
-    del kwargs['Release']
+
+    if kwargs.get('Release', None):
+        del kwargs['Release']
 
     #Sec vertex finding
     for k, v in SecVertexingAndAssociators.items():
@@ -344,7 +357,6 @@ if __name__=="__main__":
 
     from AthenaConfiguration.AllConfigFlags import ConfigFlags as cfgFlags
 
-    cfgFlags.Input.isMC=True
     cfgFlags.Input.Files= args.filesIn.split(",")
     #cfgFlags.Input.isMC=False
     #cfgFlags.Input.Files=["/atlas/guirriec/git-athena/q431_2019-03-02T2147/myESD_2019.pool.root"]
@@ -378,7 +390,8 @@ if __name__=="__main__":
         if args.release == "21.2":
             kwargs["TimeStamp"] = ['201810','201903']
             kwargs['Release'] = '21'
-        kwargs["SplitAlg"] = args.splitAlg
+        if args.splitAlg:
+            kwargs["SplitAlg"] = args.splitAlg
 
         acc.merge(BTagCfg(cfgFlags, JetCollection = JetCollection, **kwargs))