Merge pull request #39 from DUNE-DAQ/aeo/tpg-rs-scale-by-plane

Added TPG RS Factors By Plane

schema/fddaqconf/readoutgen.jsonnet

@@ -93,11 +93,16 @@ local cs = {
     s.field( "tpg_threshold_plane0", types.count, default=0, doc="Select TPG threshold for plane 0. Defaults to tpg_threshold_default value if empty."),
     s.field( "tpg_threshold_plane1", types.count, default=0, doc="Select TPG threshold for plane 1. Defaults to tpg_threshold_default value if empty."),
     s.field( "tpg_threshold_plane2", types.count, default=0, doc="Select TPG threshold for plane 2. Defaults to tpg_threshold_default value if empty."),
-    s.field( "tpg_rs_memory_factor", types.float4, default=0.8, doc="Memory factor (R) for the TPG running sum algorithms"),
-    s.field( "tpg_rs_scale_factor", types.count, default=2, doc="Scale factor for the TPG running sum algorithms"),
+    s.field( "tpg_rs_memory_factor_default", types.float4, default=0.8, doc="Default memory factor (R) for the TPG running sum algorithms."),
+    s.field( "tpg_rs_memory_factor_plane0", types.float4, default=-1, doc="Plane 0 memory factor (R) for the TPG running sum algorithms. Defaults to tpg_rs_memory_factor_default value if empty."),
+    s.field( "tpg_rs_memory_factor_plane1", types.float4, default=-1, doc="Plane 1 memory factor (R) for the TPG running sum algorithms. Defaults to tpg_rs_memory_factor_default value if empty."),
+    s.field( "tpg_rs_memory_factor_plane2", types.float4, default=-1, doc="Plane 2 memory factor (R) for the TPG running sum algorithms. Defaults to tpg_rs_memory_factor_default value if empty."),
+    s.field( "tpg_rs_scale_factor_default", types.count, default=2, doc="Default scale factor for the TPG running sum algorithms."),
+    s.field( "tpg_rs_scale_factor_plane0", types.count, default=0, doc="Plane 0 scale factor for the TPG running sum algorithms. Defaults to tpg_rs_scale_factor_default value if empty."),
+    s.field( "tpg_rs_scale_factor_plane1", types.count, default=0, doc="Plane 1 scale factor for the TPG running sum algorithms. Defaults to tpg_rs_scale_factor_default value if empty."),
+    s.field( "tpg_rs_scale_factor_plane2", types.count, default=0, doc="Plane 2 scale factor for the TPG running sum algorithms. Defaults to tpg_rs_scale_factor_default value if empty."),
     s.field( "tpg_frugal_streaming_accumulator_limit", types.count, default=10, doc="Accumulator limit for the frugal streaming method"),
     s.field( "tpg_algorithm", types.string, default="SimpleThreshold", doc="Select TPG algorithm (SimpleThreshold, AbsRS)"),
-    s.field( "enable_simple_threshold_on_plane2", types.flag, default=false, doc="Enable SimpleThreshold TPG algorithm only on plane 2 when a Running Sum algorithm is enabled."),
     s.field( "tpg_channel_mask", self.id_list, default=[], doc="List of offline channels to be masked out from the TPHandler"),
     s.field( "tpset_min_latency_ticks", types.uint8, 3125000, doc="Latency introduced to allow for TPs to arrive and be reordered, default is 50 ms"),
     s.field( "tardy_tp_quiet_time_at_start_sec", types.int4, 10, doc="Amount of time that warning messages about tardy TPs will be suppressed at the start of a run, default is 10s"),