cmakelists and rename turcal streams

Hlt/Hlt2Conf/CMakeLists.txt

@@ -139,8 +139,6 @@ if(BUILD_TESTING AND NOT USE_DD4HEP)
             Hlt2Conf.sprucing.test_pass_spruce_2022_data_bandq_check
             Hlt2Conf.sprucing.test_pass_spruce_2022_data_bnoc_check
             Hlt2Conf.sprucing.test_pass_spruce_2022_data_charm_check
-            Hlt2Conf.sprucing.test_pass_spruce_2022_data_charmtodimuon_check
-            Hlt2Conf.sprucing.test_pass_spruce_2022_data_dimuonnoip_check
             Hlt2Conf.sprucing.test_pass_spruce_2022_data_qee_check
             Hlt2Conf.sprucing.test_pass_spruce_2022_data_rd_check
             Hlt2Conf.sprucing.test_pass_spruce_2022_data_sl_check

Hlt/Hlt2Conf/python/Hlt2Conf/Sprucing_production.py

@@ -134,21 +134,21 @@ def turcal_spruce_production(options: Options):
         "pid": ["Hlt2PID.*Decision"],
         "trackeff": ["Hlt2TrackEff.*Decision", "Hlt2HadInt.*Decision"],
         "monitoring": ["Hlt2Monitoring.*Decision"],
-        "pid_rb": ["Hlt2PID.*Decision"],
-        "trackeff_rb": ["Hlt2TrackEff.*Decision", "Hlt2HadInt.*Decision"],
-        "monitoring_rb": ["Hlt2Monitoring.*Decision"],
+        "pid_raw": ["Hlt2PID.*Decision"],
+        "trackeff_raw": ["Hlt2TrackEff.*Decision", "Hlt2HadInt.*Decision"],
+        "monitoring_raw": ["Hlt2Monitoring.*Decision"],
     }
 
     streams_spruce.streams = list(linedict.keys())
     streams_spruce.stream_banks = {
         key: []
-        for key in streams_spruce.streams if "rb" not in key
+        for key in streams_spruce.streams if "raw" not in key
     }
 
     # For 10% of events we want to keep detector rawbanks (see the prescale)
     streams_spruce.stream_banks.update({
         key: DETECTOR_RAW_BANK_TYPES
-        for key in streams_spruce.streams if "rb" in key
+        for key in streams_spruce.streams if "raw" in key
     })
     print("Banks for each stream : ", streams_spruce.stream_banks)
 
@@ -158,7 +158,7 @@ def turcal_spruce_production(options: Options):
                 name="Pass" + wg,
                 hlt2_filter_code=linedict[wg],
             )]
-            for wg in linedict if "rb" not in wg
+            for wg in linedict if "raw" not in wg
         }
 
         streamdict.update({
@@ -168,7 +168,7 @@ def turcal_spruce_production(options: Options):
                     hlt2_filter_code=linedict[wg],
                     prescale=0.1)
             ]
-            for wg in linedict if "rb" in wg
+            for wg in linedict if "raw" in wg
         })
         return streamdict
 

Hlt/Hlt2Conf/tests/options/sprucing/spruce_check_2022_data.py

@@ -74,9 +74,9 @@ def turcal_lines_running(wg):
         "pid": turcal_pid_lines,
         "trackeff": turcal_trackeff_lines,
         "monitoring": turcal_monitoring_lines,
-        "pid_rb": turcal_pid_lines,
-        "trackeff_rb": turcal_trackeff_lines,
-        "monitoring_rb": turcal_monitoring_lines,
+        "pid_raw": turcal_pid_lines,
+        "trackeff_raw": turcal_trackeff_lines,
+        "monitoring_raw": turcal_monitoring_lines,
     }
     return [item for item in list(linedict[wg].keys())]
 
@@ -85,9 +85,7 @@ hlt2_bandq_charmtodimuon_lines = {
     **hlt2_bandq_lines,
     **hlt2_charmonium_to_dimuon_lines
 }
-print("hlt2_bandq_charmtodimuon_lines ", hlt2_bandq_charmtodimuon_lines)
 hlt2_qee_dimuonnoip_lines = {**hlt2_qee_lines, **hlt2_DiMuonNoIP_lines}
-print("hlt2_qee_dimuonnoip_lines ", hlt2_qee_dimuonnoip_lines)
 
 
 def hlt2_lines_running(wg):

Hlt/Hlt2Conf/tests/qmtest/sprucing.qms/test_turcal_spruce_2022_data_pid_rb_check.qmt

@@ -22,13 +22,13 @@ Runs over the output of test_turcal_spruce_2022_data
 <argument name="args"><set>
   <text>$HLT2CONFROOT/tests/options/sprucing/spruce_check_2022_data.py</text>
   <text>-input</text>
-  <text>pass_turcal_lines_production.pid_rb.dst</text>
+  <text>pass_turcal_lines_production.pid_raw.dst</text>
   <text>-manifest</text>
   <text>pass_turcal_lines_production.tck.json</text>
   <text>-job_type</text>
   <text>pass_turcal</text>
   <text>-stream</text>
-  <text>pid_rb</text>
+  <text>pid_raw</text>
   <text>-rb_to_check</text>
   <text>16</text><text>73</text><text>64</text><text>9</text><text>13</text><text>84</text><text>77</text>
   </set></argument>