Merge pull request #73 from DUNE-DAQ/eflumerf/FixFakeHSISegment

Eflumerf/fix fake hsi segment

python/integrationtest/config/trigger-segment-fakehsi.data.xml

@@ -226,7 +226,6 @@
 
 <obj class="Segment" id="trg-segment">
  <rel name="applications">
-  <ref class="TriggerApplication" id="tc-maker-1"/>
   <ref class="MLTApplication" id="mlt"/>
   <ref class="HSIEventToTCApplication" id="hsi-to-tc-app"/>
  </rel>
@@ -304,26 +303,6 @@
  <attr name="time_after" type="u32" val="1000"/>
 </obj>
 
-<obj class="TriggerApplication" id="tc-maker-1">
- <attr name="application_name" type="string" val="daq_application"/>
- <rel name="runs_on" class="VirtualHost" id="vlocalhost"/>
- <rel name="exposes_service">
-  <ref class="Service" id="triggerActivities"/>
-  <ref class="Service" id="dataRequests"/>
- </rel>
- <rel name="source_id" class="SourceIDConf" id="ta-srcid-1"/>
- <rel name="queue_rules">
-  <ref class="QueueConnectionRule" id="ta-queue-rule"/>
- </rel>
- <rel name="network_rules">
-  <ref class="NetworkConnectionRule" id="ta-net-rule"/>
-  <ref class="NetworkConnectionRule" id="tc-net-rule"/>
-  <ref class="NetworkConnectionRule" id="data-req-trig-net-rule"/>
- </rel>
- <rel name="data_subscriber" class="DataReaderConf" id="ta-subscriber-1"/>
- <rel name="trigger_inputs_handler" class="DataHandlerConf" id="def-ta-handler"/>
-</obj>
-
 <obj class="TCMakerPrescaleAlgorithm" id="tc-pass-through-algo">
  <attr name="prescale" type="u32" val="100"/>
 </obj>

python/integrationtest/integrationtest_drunc.py

@@ -115,6 +115,7 @@ class CreateConfigResult:
             dro_map_file = conf_dict["readout"]["dro_map"].replace(
                 "INTEGTEST_CONFDIR", os.path.dirname(__file__) + "/config"
             )
+
 
     if "dataflow" in conf_dict.keys():
         if "segment_config" in conf_dict["dataflow"].keys():
@@ -267,6 +268,22 @@ class CreateConfigResult:
 
             if not signal_matched:
                 print(f"WARNING: Could not find matching TCReadoutMap entry for signal type {signal}")
+
+        if use_hsi:
+            signalwindows = db.get_dals(class_name = "HSISignalWindow")
+
+            for input_map_entry in conf_dict["trigger"]["ttcm_input_map"]:
+                signal_matched = False
+                signal = input_map_entry["signal"]
+                for sw in signalwindows:
+                    if sw.signal_type == signal:
+                        signal_matched = True
+                        sw.time_before = input_map_entry["time_before"]
+                        sw.time_after = input_map_entry["time_after"]
+                        db.update_dal(sw)
+
+                if not signal_matched:
+                    print(f"WARNING: Could not find matching HSISignalWindow entry for signal type {signal}")
         db.commit()
 
     conf_dict["boot"]["use_connectivity_service"] = True

setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = integrationtest
-version = 2.3.2
+version = 2.3.3
 url = https://github.com/DUNE-DAQ/integrationtest
 long_description = file: docs/README.md
 long_description_content_type = text/markdown