Update Mu2e Sample System example configuration, fix list iteration mismatch

rc/control/daqinterface.py

@@ -1844,10 +1844,9 @@ def get_artdaq_log_filenames(self):
                 )
                 out, err = proc.communicate()
                 proclines = out.strip().split("\n")
+                proclines = [line for line in proclines if re.search(r"\.log$", line)]
 
-                if len(
-                    [line for line in proclines if re.search(r"\.log$", line)]
-                ) == len(proctypes):
+                if len(proclines) == len(proctypes):
                     break  # Success
                 else:
                     if num_logfile_checks == max_num_logfile_checks:

simple_test_config/mu2e_sample_system/EventBuilder1.fcl

@@ -2,24 +2,24 @@
 
 daq: {
   event_builder: {
-	expected_fragments_per_event: 0  # Will be set by DAQInterface
-	use_art: true
-	print_event_store_stats: true
-	buffer_count: 20
-	max_incomplete_events: 75 # Same as boardreader sync interval
-	verbose: true
-	init_fragment_count: 2
-	send_requests: true
-multicast_interface_ip: "0.0.0.0"
-		request_port: 3001
-		request_address: "227.128.12.26" # Multicast request address
+    expected_fragments_per_event: 0  # Will be set by DAQInterface
+    use_art: true
+    print_event_store_stats: true
+    buffer_count: 20
+    max_incomplete_events: 75 # Same as boardreader sync interval
+    verbose: true
+    init_fragment_count: 2
+    send_requests: true
+    multicast_interface_ip: "0.0.0.0"
+    request_port: 3001
+    request_address: "227.128.12.26" # Multicast request address
     art_analyzer_count: 2
 
-	routing_token_config: {
-	use_routing_manager: false
-	}
+    routing_token_config: {
+      use_routing_manager: false
+    }
 
-	sources: { }
+    sources: { }
   }
 
   metrics: {

simple_test_config/mu2e_sample_system/boot.txt

@@ -1,5 +1,5 @@
 
-DAQ setup script: $yourArtdaqInstallationDir/setupARTDAQDEMO
+DAQ setup script: $yourArtdaqInstallationDir/artdaq_demo_rte.sh
 
 PMT host: localhost
 request_address: "227.128.130.130"

simple_test_config/mu2e_sample_system/component_crv01.fcl

@@ -1,6 +1,5 @@
   daq: {
   fragment_receiver: {
-	mpi_sync_interval: 50
 
 	# CommandableFragmentGenerator Configuration:
 fragment_ids: []
@@ -33,8 +32,8 @@ multicast_interface_ip: "0.0.0.0"
 
 request_window_offset: 1 # Request message contains tzero. Window will be from tzero - offset to tz-o + width
 request_window_width: 3 # These settings correspond to "one before, ts, one after"
-stale_request_timeout: 0xFFFFFFFF # How long to wait before discarding request messages that are outside the available data
 request_windows_are_unique: false # If request windows are unique, avoids a copy operation, but the same data point cannot be used for two requests. If this is not anticipated, leave set to "true"
+send_missing_request_fragments: false
 
 separate_data_thread: true # MUST be true for requests to be applied! If requesting is not desired, but a separate readout thread is, set this to true, requests_enabled to false and request_mode to ignored.
 

simple_test_config/mu2e_sample_system/component_trkcal01.fcl

@@ -1,6 +1,5 @@
   daq: {
   fragment_receiver: {
-	mpi_sync_interval: 50
 
 	# CommandableFragmentGenerator Configuration:
 	fragment_ids: []

simple_test_config/mu2e_sample_system/component_trkcal02.fcl

@@ -1,6 +1,5 @@
   daq: {
   fragment_receiver: {
-	mpi_sync_interval: 50
 
 	# CommandableFragmentGenerator Configuration:
 	fragment_ids: []