Add DAQ devices and additional devices to rig schema.

AllenNeuralDynamics · Jan 18, 2025 · e4a1449 · e4a1449
1 parent b4cdbe5
commit e4a1449
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 5 deletions.
diff --git a/examples/multiplane_ophys_rig.json b/examples/multiplane_ophys_rig.json
@@ -688,7 +688,30 @@
          "beam_modulation_unit": "Volts"
       }
    ],
-   "additional_devices": [],
+   "additional_devices": [
+      {
+         "device_type": "Computer",
+         "name": "MESO1STIM",
+         "serial_number": null,
+         "manufacturer": null,
+         "model": null,
+         "path_to_cad": null,
+         "port_index": null,
+         "additional_settings": {},
+         "notes": null
+      },
+      {
+         "device_type": "Computer",
+         "name": "MESO1SYNC",
+         "serial_number": null,
+         "manufacturer": null,
+         "model": null,
+         "path_to_cad": null,
+         "port_index": null,
+         "additional_settings": {},
+         "notes": null
+      }
+   ],
    "daqs": [
       {
          "device_type": "DAQ Device",
@@ -734,7 +757,18 @@
          "notes": null,
          "data_interface": "PCIe",
          "computer_name": "SYNC",
-         "channels": [],
+         "channels": [
+            {
+               "channel_name": "P0.3",
+               "device_name": "MESO1STIM",
+               "channel_type": "Digital Input",
+               "port": 0,
+               "channel_index": 3,
+               "sample_rate": "100.0",
+               "sample_rate_unit": "kilohertz",
+               "event_based_sampling": null
+            }
+         ],
          "firmware_version": null,
          "hardware_version": null
       },

diff --git a/examples/multiplane_ophys_rig.py b/examples/multiplane_ophys_rig.py
@@ -19,6 +19,7 @@
     DAQDevice,
     DataInterface,
     Detector,
+    Device,
     Disc,
     Filter,
     Laser,
@@ -536,21 +537,24 @@
             serial_number="354683BK",
         )
     ],
-    additional_devices=[],
+    additional_devices=[
+        Device(device_type="Computer", name="MESO1STIM"),
+        Device(device_type="Computer", name="MESO1SYNC"),
+    ],
     daqs=[
         DAQDevice(
             device_type="DAQ Device",
             name="VBEB DAQ",
             serial_number=None,
             manufacturer=Organization.NATIONAL_INSTRUMENTS,
+            channels=[],
             model="USB-6001",
             path_to_cad=None,
             port_index=None,
             additional_settings=AindGeneric(),
             notes=None,
             data_interface="USB",
             computer_name="STIM",
-            channels=[],
             firmware_version=None,
             hardware_version=None,
         ),
@@ -566,7 +570,17 @@
             notes=None,
             data_interface="PCIe",
             computer_name="SYNC",
-            channels=[],
+            channels=[
+                DAQChannel(
+                    channel_name="P0.3",
+                    device_name="MESO1STIM",
+                    channel_type=DaqChannelType.DI,
+                    port=0,
+                    channel_index=3,
+                    sample_rate=100.0,
+                    sample_rate_unit=FrequencyUnit.KHZ,
+                )
+            ],
             firmware_version=None,
             hardware_version=None,
         ),