Cleanup dump-single-btag-flow

FTagDumper/bin/dump-single-btag-flow

-#!/usr/bin/env python3
-
-"""
-
-This script is similar to dump-single-btag, adds TrackFlowOverlapRemovalAlg
-Necessary to dump the flow constiturnts and not duplicate the charged ones that are listed in tracks 
-
-"""
-
-import sys
-from FTagDumper import dumper
-
-from AthenaConfiguration.ComponentAccumulator import ComponentAccumulator
-from AthenaConfiguration.ComponentFactory import CompFactory
-
-
-def orCfg(name, jets, tracks='BTagTrackToJetAssociator'):
-    ca = ComponentAccumulator()
-    ca.addEventAlgo(
-        CompFactory.TrackFlowOverlapRemovalAlg(
-            name=name,
-            Tracks=f'{jets}.{tracks}',
-            Constituents=f'{jets}.constituentLinks',
-            OutTracks=f'{jets}.nonConstituentTracks'
-        )
-    )
-    ca.addEventAlgo(
-        CompFactory.FlowSelectorAlg(
-            name="NeutralFlowSelectorAlg",
-            Constituents=f'{jets}.constituentLinks',
-            OutConstituentsNeutral=f'{jets}.neutralConstituentLinks',
-            OutConstituentsCharged=f'{jets}.chargedConstituentLinks'
-        )
-    )
-    return ca
-
-
-def run():
-
-    args = dumper.base_parser(__doc__).parse_args()
-
-    flags = dumper.update_flags(args)
-    flags.lock()
-
-    ca = dumper.getMainConfig(flags)
-
-    ca.merge(orCfg('nonConstituentAdder', 'AntiKt4EMPFlowJets', 'TracksForBTagging'))
-
-    ca.merge(dumper.getDumperConfig(args))
-    return ca.run()
-
-
-if __name__ == '__main__':
-    code = run()
-    sys.exit(0 if code.isSuccess() else 1)
-

FTagDumper/python/blocks/FlowSelector.py

@@ -16,6 +16,7 @@ class FlowSelector(BaseBlock):
     """
 
     jet_collection: str = None
+    name: str = "NeutralFlowSelectorAlg"
 
     def __post_init__(self):
         if self.jet_collection is None:
@@ -26,7 +27,7 @@ class FlowSelector(BaseBlock):
         ca = ComponentAccumulator()
         ca.addEventAlgo(
             CompFactory.FlowSelectorAlg(
-                name="NeutralFlowSelectorAlg",
+                name=self.name,
                 Constituents=f'{self.jet_collection}.constituentLinks',
                 OutConstituentsNeutral=f'{self.jet_collection}.neutralConstituentLinks',
                 OutConstituentsCharged=f'{self.jet_collection}.chargedConstituentLinks'

FTagDumper/python/blocks/TrackFlowOverlapRemoval.py

@@ -18,6 +18,7 @@ class TrackFlowOverlapRemoval(BaseBlock):
 
     jet_collection: str = None
     track_container: str = None
+    name: str = "nonConstituentAdder"
 
     def __post_init__(self):
         if self.jet_collection is None:
@@ -29,7 +30,7 @@ class TrackFlowOverlapRemoval(BaseBlock):
         ca = ComponentAccumulator()
         ca.addEventAlgo(
             CompFactory.TrackFlowOverlapRemovalAlg(
-                name='nonConstituentAdder',
+                name=self.name,
                 Tracks=f'{self.jet_collection}.{self.track_container}',
                 Constituents=f'{self.jet_collection}.constituentLinks',
                 OutTracks=f'{self.jet_collection}.nonConstituentTracks'

FTagDumper/test/test-dumper

@@ -150,7 +150,7 @@ declare -A TESTS=(
     [trigger-hits]=dump-trigger-emtopo
     [trigger-hitz-network]=dump-trigger-emtopo
     [jer]=dump-jer
-    [neutral]=dump-single-btag-flow
+    [neutral]=dump-single-btag
     [retag-fatjet]=dump-retag-fatjet
     [taucomp]=dump-single-btag
     [blocks]=dump-single-btag

configs/EMPFlow_all_flows.json

@@ -149,6 +149,15 @@
             "decorate_summary": true
         }
     ],
+    "ca_blocks" : [
+        {
+            "block": "FlowSelector"
+        },
+        {
+            "block" : "TrackFlowOverlapRemoval",
+            "track_container" : "TracksForBTagging"
+        }
+    ],
     "decorate": {
         "jet_aug": false,
         "btag_jes": true,

configs/EMPFlow_all_flows_spot.json

@@ -141,6 +141,15 @@
             "decorate_summary": true
         }
     ],
+    "ca_blocks" : [
+        {
+            "block": "FlowSelector"
+        },
+        {
+            "block" : "TrackFlowOverlapRemoval",
+            "track_container" : "TracksForBTagging"
+        }
+    ],
     "decorate": {
         "jet_aug": false,
         "btag_jes": true,