Changes to fix all_lines tests

Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime.py

@@ -52,7 +52,18 @@ options.output_manifest_file = "spruce_all_lines_realtime_newPacking_newDst.tck.
 # metainfo_repos.global_bind( extra_central_tags = [  'key-43a25419' ] )
 
 
+def _pop_line(linename, line_dict):
+    print(f"Removing {linename}")
+    line_dict.pop(linename)
+    return 0
+
+
 def make_lines():
+    for linename in [
+            name for name in sprucing_lines.keys()
+            if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+    ]:
+        _pop_line(linename, sprucing_lines)
     return [builder() for builder in sprucing_lines.values()]
 
 

Hlt/Hlt2Conf/options/sprucing/spruce_all_lines_realtime_test_old_json.py

@@ -45,7 +45,18 @@ options.output_type = 'ROOT'
 options.output_manifest_file = "spruce_all_lines_realtime_newPacking.tck.json"
 
 
+def _pop_line(linename, line_dict):
+    print(f"Removing {linename}")
+    line_dict.pop(linename)
+    return 0
+
+
 def make_lines():
+    for linename in [
+            name for name in sprucing_lines.keys()
+            if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+    ]:
+        _pop_line(linename, sprucing_lines)
     return [builder() for builder in sprucing_lines.values()]
 
 

Hlt/Hlt2Conf/python/Hlt2Conf/Sprucing_tests.py

@@ -25,6 +25,12 @@ from Moore import streams_spruce
 public_tools = [stateProvider_with_simplified_geom()]
 
 
+def _pop_line(linename, line_dict):
+    print(f"Removing {linename}")
+    line_dict.pop(linename)
+    return 0
+
+
 def spruce_streaming(options: Options):
     """
     Test streaming of sprucing lines. Produces two spruce_streaming.dst files prepended by stream name
@@ -71,6 +77,11 @@ def spruce_all_lines_realtime(options: Options):
     metainfo_repos.global_bind(extra_central_tags=['key-ac5f2a28'])
 
     def make_lines():
+        for linename in [
+                name for name in sprucing_lines.keys()
+                if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+        ]:
+            _pop_line(linename, sprucing_lines)
         return [builder() for builder in sprucing_lines.values()]
 
     config = run_moore(options, make_lines, public_tools)
@@ -227,6 +238,11 @@ def spruce_all_lines_realtime_test_old_json(options: Options):
     """
 
     def make_lines():
+        for linename in [
+                name for name in sprucing_lines.keys()
+                if name.startswith('SpruceQEE_ZToMuMu_TrackEff_')
+        ]:
+            _pop_line(linename, sprucing_lines)
         return [builder() for builder in sprucing_lines.values()]
 
     ##Old file has the "Line" suffix on lines