Merge branch 'fix_routing_bits_writing' into 'master'

Do not copy Hlt1 routing bits bank in Hlt2

See merge request !1973

Hlt/Hlt2Conf/tests/options/streaming/stream_check.py

@@ -40,6 +40,7 @@ def routing_bits():
     """Return a list with the 96 routing bit values."""
     rawevent = TES['/Event/DAQ/RawEvent']
     rbbanks = rawevent.banks(LHCb.RawBank.HltRoutingBits)
+    assert rbbanks.size() == 1  # stop if we have multiple rb banks
     on_bits = []
     for bank in range(0, len(rbbanks)):
         d = rbbanks[bank].data()

Hlt/Moore/python/Moore/config.py

@@ -466,7 +466,10 @@ def moore_control_flow(options, streams, process, analytics=False):
     if options.output_file or options.output_type == ONLINE or analytics:
         input_raw_bank_types = []
         if process == 'hlt2':
-            input_raw_bank_types += HLT1_REPORT_RAW_BANK_TYPES
+            # do not copy the Routing Bits bank from Hlt1, there should only be one in the event
+            hlt1_types = HLT1_REPORT_RAW_BANK_TYPES.copy()
+            hlt1_types.remove("HltRoutingBits")
+            input_raw_bank_types += hlt1_types
         elif process == 'spruce' or process == "pass":
             input_raw_bank_types += (HLT1_REPORT_RAW_BANK_TYPES
                                      | HLT2_REPORT_RAW_BANK_TYPES)