Merge pull request #167 from art-daq/eflumerf/SubrunTransitionIssues

Modift the mu2e_sample_system to reflect the software event building …

Author: eflumerf

simple_test_config/mu2e_sample_system/DataLogger1.fcl

@@ -44,7 +44,7 @@ source: {
 outputs: {
   normalOutput: {
     module_type: RootDAQOut
-    fileName: "/tmp/trkcal_r%06r_sr%02s_%to_%#.root"
+    fileName: "/tmp/trkcal_r%06r_sr%02s_%#.root"
     fileProperties: { maxSubRuns: 1 maxRuns: 1  }
     fastCloning: false
     compressionLevel: 501 # ZSTD

simple_test_config/mu2e_sample_system/EventBuilder1.fcl

@@ -10,6 +10,7 @@ daq: {
 	verbose: true
 	init_fragment_count: 2
 	send_requests: false
+    art_analyzer_count: 2
 
 	routing_token_config: {
 	use_routing_manager: false

simple_test_config/mu2e_sample_system/EventFilter1.fcl

@@ -10,16 +10,11 @@ daq: {
 	verbose: true
 	init_fragment_count: 0
 	send_requests: false
+    art_analyzer_count: 5
 
     routing_token_config: {
         ## True if using the Routing Manager
-        use_routing_manager: true
-
-        ## Port to send tokens on
-        routing_token_port: 35555  # default
-
-        ## Hostname or IP of RoutingManager
-        routing_manager_hostname: "localhost"  # default
+        use_routing_manager: false
    }
 
 	sources: { }
@@ -43,7 +38,7 @@ services: {
 outputs: {
   subsystemOutput: {
     module_type: RootNetOutput
-    #SelectEvents: [ delay ]
+    SelectEvents: [ delay ]
     #broadcast_sends: true
 	destinations: {	}
 
@@ -86,6 +81,9 @@ physics: {
   }
 
   producers: {
+        demoProd: {
+            module_type: DemoDataProducer
+        }
   }
 
   filters: {
@@ -102,8 +100,9 @@ physics: {
 	}
   }
 
-  #delay: [ randomDelay ]
+  delay: [ randomDelay ]
   a1: [ toy1Integ, toy2Integ ]
+  p1: [ demoProd ]
   my_output_modules: [ lumiOutput, subsystemOutput ]
   #my_output_modules: [ normalOutput ]
 }

simple_test_config/mu2e_sample_system/EventFilter2.fcl

@@ -10,16 +10,11 @@ daq: {
 	verbose: true
 	init_fragment_count: 0
 	send_requests: false
+    art_analyzer_count: 5
 
     routing_token_config: {
         ## True if using the Routing Manager
-        use_routing_manager: true
-
-        ## Port to send tokens on
-        routing_token_port: 35555  # default
-
-        ## Hostname or IP of RoutingManager
-        routing_manager_hostname: "localhost"  # default
+        use_routing_manager: false
    }
 
 	sources: { }
@@ -43,7 +38,7 @@ services: {
 outputs: {
   subsystemOutput: {
     module_type: RootNetOutput
-    #SelectEvents: [ delay ]
+    SelectEvents: [ delay ]
     #broadcast_sends: true
 	destinations: {	}
 
@@ -86,6 +81,9 @@ physics: {
   }
 
   producers: {
+        demoProd: {
+            module_type: DemoDataProducer
+        }
   }
 
   filters: {
@@ -102,8 +100,9 @@ physics: {
 	}
   }
 
-  #delay: [ randomDelay ]
+  delay: [ randomDelay ]
   a1: [ toy1Integ, toy2Integ ]
+  p1: [ demoProd ]
   my_output_modules: [ lumiOutput, subsystemOutput ]
   #my_output_modules: [ normalOutput ]
 }

simple_test_config/mu2e_sample_system/LumiLogger.fcl

@@ -44,7 +44,7 @@ source: {
 outputs: {
   normalOutput: {
     module_type: RootDAQOut
-    fileName: "/tmp/lumi_r%06r_sr%02s_%to_%#.root"
+    fileName: "/tmp/lumi_r%06r_sr%02s_%#.root"
     fileProperties: { maxSubRuns: 1 maxRuns: 1  }
     fastCloning: false
     compressionLevel: 3

simple_test_config/mu2e_sample_system/boot.txt

@@ -38,6 +38,6 @@ Dispatcher host: localhost
 Dispatcher label: Dispatcher1
 Dispatcher subsystem: 2
 
-RoutingManager host: localhost
-RoutingManager label: RoutingManager1
-RoutingManager subsystem: 1
+# RoutingManager host: localhost
+# RoutingManager label: RoutingManager1
+# RoutingManager subsystem: 1

simple_test_config/mu2e_sample_system/component_trkcal01.fcl

@@ -62,36 +62,17 @@ max_fragment_size_bytes: 1024
 throttle_usecs: 0
 usecs_between_sends: 10000
 	  distribution_type: 2
-	  timestamp_scale_factor: 2
-	  sequence_scale_factor: 2
-	  skip_seqID_test: true
+	  timestamp_scale_factor: 1
+	  sequence_scale_factor: 1
+	  skip_seqID_test: false
+      rollover_subrun_interval: 100
+
 
 		destinations: { }
 
 	routing_table_config: {
 		   ## True if using the Routing Manager
-		   use_routing_manager: true
-
-	   route_on_request_mode: true
-
-		   ## Port that table updates should arrive on
-		   table_update_port: 35556  # default
-
-		   ## Address that table updates should arrive on
-		   table_update_address: "227.128.12.28"  # default
-
-		   ## Port that acknowledgements should be sent to
-		  table_acknowledge_port: 35557  # default
-
-		   ## Host that acknowledgements should be sent to
-		   routing_manager_hostname: "localhost"  # default
-			table_update_multicast_interface: "0.0.0.0"
-
-		   ## Time to wait (in ms) for a routing table update if the table is exhausted
-		   routing_timeout_ms: 1000  # default
-
-		   ## Number of times to retry getting destination from routing table
-		   routing_retry_count: 5  # default
+		   use_routing_manager: false
 		}
   }
 

simple_test_config/mu2e_sample_system/component_trkcal02.fcl

@@ -53,45 +53,25 @@
 
 		generator: ToySimulator
 	  fragment_type: TOY1
-	  fragment_id: 0
-	  starting_fragment_id: 0
+	  fragment_id: 1
+	  starting_fragment_id: 1
 	  random_seed: 2899
 	  sleep_on_stop_us: 500000
 	  nADCcounts: 40
 		max_fragment_size_bytes: 1024
 throttle_usecs: 0
 usecs_between_sends: 10000
 	  distribution_type: 2
-	  timestamp_scale_factor: 2
-	  sequence_scale_factor: 2
-	  skip_seqID_test: true
-	  initial_sequence_id: 2
+	  timestamp_scale_factor: 1
+	  sequence_scale_factor: 1
+	  skip_seqID_test: false
+	  initial_sequence_id: 1
 
 		destinations: { }
 
 	routing_table_config: {
 		   ## True if using the Routing Manager
-		   use_routing_manager: true
-	   route_on_request_mode: true
-
-		   ## Port that table updates should arrive on
-		   table_update_port: 35556  # default
-
-		   ## Address that table updates should arrive on
-		   table_update_address: "227.128.12.28"  # default
-
-		   ## Port that acknowledgements should be sent to
-		  table_acknowledge_port: 35557  # default
-
-		   ## Host that acknowledgements should be sent to
-		   routing_manager_hostname: "localhost"  # default
-			table_update_multicast_interface: "0.0.0.0"
-
-		   ## Time to wait (in ms) for a routing table update if the table is exhausted
-		   routing_timeout_ms: 1000  # default
-
-		   ## Number of times to retry getting destination from routing table
-		   routing_retry_count: 5  # default
+		   use_routing_manager: false
 		}
   }