Merge pull request #15 from DUNE-DAQ/wpv_updates

move README and update configuration options
DUNE-DAQ · Jul 20, 2021 · 8811051 · 8811051
2 parents fa22c15 + 74873f8
commit 8811051
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 9 deletions.
diff --git a/README.md → docs/README.md b/README.md → docs/README.md
@@ -9,12 +9,6 @@ To use the ND-LAr data generator you will need python packages:
 - larpix-control - tested on version 3.5.1
 - pyzmq - tested on version 18.1.1
 
-For full functionality, the following additional branches must be locally compiled:
-
-https://github.com/peter-madigan/dataformats/tree/develop
-
-https://github.com/krisfur/readout/tree/kf_newframe
-
 ## ND-LAr: Examples with PACMAN data snapshots
 In one terminal, launch a fake pacman emulation by navigating to the test folder and running:
 

diff --git a/python/lbrulibs/app_confgen.py b/python/lbrulibs/app_confgen.py
@@ -106,7 +106,12 @@ def generate(
 
     confcmd = mrccmd("conf", "INITIAL", "CONFIGURED", [
                 ("fake_source",pcr.Conf(
-                            pcr.GeoID(system="kNDLarTPC"),
+                     link_confs=[pcr.LinkConfiguration(
+                                geoid=pcr.GeoID(system="kNDLarTPC", region=0, element=idx),
+                            ) for idx in range(NUMBER_OF_DATA_PRODUCERS)]
+                            + [pcr.LinkConfiguration(
+                                geoid=pcr.GeoID(system="TPC", region=0, element=idx),
+                            ) for idx in range(NUMBER_OF_DATA_PRODUCERS, NUMBER_OF_DATA_PRODUCERS+NUMBER_OF_TP_PRODUCERS)],
                             zmq_receiver_timeout = 10000
                         )),
             ] + [
@@ -122,7 +127,8 @@ def generate(
             ] + [
                 (f"data_recorder_{idx}", bfs.Conf(
                         output_file = f"output_{idx}.out",
-                        stream_buffer_size = 100#8388608
+                        stream_buffer_size = 100,#8388608
+                        use_o_direct = 0
                         )) for idx in range(NUMBER_OF_DATA_PRODUCERS)
             ])
 

diff --git a/python/lbrulibs/fake_NDreadout.json b/python/lbrulibs/fake_NDreadout.json
@@ -126,6 +126,15 @@
                 {
                     "data": {
                         "card_id": 0,
+                        "link_confs": [
+                            {
+                                "geoid": {
+                                    "element": 1,
+                                    "region": 0,
+                                    "system": "NDLarTPC"
+                                }
+                            }
+                        ],
                         "zmq_receiver_timeout": 10000
                     },
                     "match": "fake_source"
@@ -135,11 +144,12 @@
                         "apa_number": 0,
                         "emulator_mode": false,
                         "fake_trigger_flag": 1,
-                        "latency_buffer_size": 10000,
+                        "latency_buffer_size": 10,
                         "link_number": 0,
                         "num_request_handling_threads": 1,
                         "pop_limit_pct": 0.8,
                         "pop_size_pct": 0.1,
+                        "postprocess_queue_sizes": 10000,
                         "source_queue_timeout_ms": 100
                     },
                     "match": "datahandler_0"

diff --git a/schema/lbrulibs/pacmancardreader.jsonnet b/schema/lbrulibs/pacmancardreader.jsonnet
@@ -28,7 +28,18 @@ local pacmancardreader = {
         s.field("system", self.system_type, doc="" )],
         doc="GeoID"),
 
+    link_conf : s.record("LinkConfiguration", [
+        s.field("geoid", self.geoid, doc="GeoID of the link")
+        ], doc="Configuration for one link"),
+
+    link_conf_list : s.sequence("link_conf_list", self.link_conf, doc="Link configuration list"),
+
+
     conf: s.record("Conf", [
+
+        s.field("link_confs", self.link_conf_list,
+                doc="Link configurations"),
+
         s.field("card_id", self.id, 0,
                 doc="FE card identifier"),