From c45b5e616425ac7a3bf0caef4bd53aab2d74f72e Mon Sep 17 00:00:00 2001 From: Dan Birman Date: Mon, 27 Jan 2025 13:44:37 -0800 Subject: [PATCH] fix: bad merge renamed rig files, renaming to instrument and re-generate --- ...ig.json => aibs_smartspim_instrument.json} | 8 +- ...im_rig.py => aibs_smartspim_instrument.py} | 0 ...ig.json => aind_smartspim_instrument.json} | 8 +- ...im_rig.py => aind_smartspim_instrument.py} | 0 .../{ephys_rig.py => ephys_insturment.py} | 0 examples/ephys_rig.json | 898 ------------------ .../{exaspim_rig.py => exaspim_instrument.py} | 0 examples/exaspim_rig.json | 452 --------- ..._rig.json => fip_behavior_instrument.json} | 8 +- ...vior_rig.py => fip_behavior_instrument.py} | 0 ...hys_rig.json => fip_ophys_instrument.json} | 8 +- ...p_ophys_rig.py => fip_ophys_instrument.py} | 0 tests/test_inst_acq_compatibility.py | 2 +- 13 files changed, 17 insertions(+), 1367 deletions(-) rename examples/{aibs_smartspim_rig.json => aibs_smartspim_instrument.json} (98%) rename examples/{aibs_smartspim_rig.py => aibs_smartspim_instrument.py} (100%) rename examples/{aind_smartspim_rig.json => aind_smartspim_instrument.json} (99%) rename examples/{aind_smartspim_rig.py => aind_smartspim_instrument.py} (100%) rename examples/{ephys_rig.py => ephys_insturment.py} (100%) delete mode 100644 examples/ephys_rig.json rename examples/{exaspim_rig.py => exaspim_instrument.py} (100%) delete mode 100644 examples/exaspim_rig.json rename examples/{fip_behavior_rig.json => fip_behavior_instrument.json} (99%) rename examples/{fip_behavior_rig.py => fip_behavior_instrument.py} (100%) rename examples/{fip_ophys_rig.json => fip_ophys_instrument.json} (99%) rename examples/{fip_ophys_rig.py => fip_ophys_instrument.py} (100%) diff --git a/examples/aibs_smartspim_rig.json b/examples/aibs_smartspim_instrument.json similarity index 98% rename from examples/aibs_smartspim_rig.json rename to examples/aibs_smartspim_instrument.json index c5f20c76b..f950cb0be 100644 --- a/examples/aibs_smartspim_rig.json +++ b/examples/aibs_smartspim_instrument.json @@ -1,13 +1,13 @@ { - "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py", - "schema_version": "1.0.5", - "rig_id": "440_SmartSPIM2_20231004", + "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/inst.py", + "schema_version": "2.0.0", + "instrument_id": "440_SmartSPIM2_20231004", "mouse_platform": null, "modification_date": "2023-10-04", "calibrations": null, "ccf_coordinate_transform": null, "origin": null, - "rig_axes": null, + "instrument_axes": null, "modalities": [ { "name": "Selective plane illumination microscopy", diff --git a/examples/aibs_smartspim_rig.py b/examples/aibs_smartspim_instrument.py similarity index 100% rename from examples/aibs_smartspim_rig.py rename to examples/aibs_smartspim_instrument.py diff --git a/examples/aind_smartspim_rig.json b/examples/aind_smartspim_instrument.json similarity index 99% rename from examples/aind_smartspim_rig.json rename to examples/aind_smartspim_instrument.json index 396f8d12f..51d739589 100644 --- a/examples/aind_smartspim_rig.json +++ b/examples/aind_smartspim_instrument.json @@ -1,13 +1,13 @@ { - "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py", - "schema_version": "1.0.5", - "rig_id": "440_SmartSPIM1_20231004", + "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/inst.py", + "schema_version": "2.0.0", + "instrument_id": "440_SmartSPIM1_20231004", "mouse_platform": null, "modification_date": "2023-10-04", "calibrations": null, "ccf_coordinate_transform": null, "origin": null, - "rig_axes": null, + "instrument_axes": null, "modalities": [ { "name": "Selective plane illumination microscopy", diff --git a/examples/aind_smartspim_rig.py b/examples/aind_smartspim_instrument.py similarity index 100% rename from examples/aind_smartspim_rig.py rename to examples/aind_smartspim_instrument.py diff --git a/examples/ephys_rig.py b/examples/ephys_insturment.py similarity index 100% rename from examples/ephys_rig.py rename to examples/ephys_insturment.py diff --git a/examples/ephys_rig.json b/examples/ephys_rig.json deleted file mode 100644 index ed7d4b035..000000000 --- a/examples/ephys_rig.json +++ /dev/null @@ -1,898 +0,0 @@ -{ - "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py", - "schema_version": "1.0.5", - "rig_id": "323_EPHYS1_20231003", - "mouse_platform": { - "device_type": "Disc", - "name": "Running Wheel", - "serial_number": null, - "manufacturer": null, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "surface_material": null, - "date_surface_replaced": null, - "radius": "15", - "radius_unit": "centimeter", - "output": null, - "encoder": null, - "decoder": null, - "encoder_firmware": null - }, - "modification_date": "2023-10-03", - "calibrations": [ - { - "calibration_date": "2023-10-02T10:22:13Z", - "device_name": "Red Laser", - "description": "Laser power calibration", - "input": { - "power percent": [ - 10, - 20, - 40 - ] - }, - "output": { - "power mW": [ - 1, - 3, - 6 - ] - }, - "notes": null - }, - { - "calibration_date": "2023-10-02T10:22:13Z", - "device_name": "Blue Laser", - "description": "Laser power calibration", - "input": { - "power percent": [ - 10, - 20, - 40 - ] - }, - "output": { - "power mW": [ - 1, - 2, - 7 - ] - }, - "notes": null - } - ], - "ccf_coordinate_transform": null, - "origin": null, - "rig_axes": null, - "modalities": [ - { - "name": "Extracellular electrophysiology", - "abbreviation": "ecephys" - } - ], - "com_ports": [], - "instrument_type": null, - "manufacturer": null, - "temperature_control": null, - "notes": null, - "connections": [], - "components": [ - { - "name": "Ephys_assemblyA", - "device_type": "Ephys assembly", - "manipulator": { - "device_type": "Manipulator", - "name": "Manipulator 1", - "serial_number": "SN2938", - "manufacturer": { - "name": "New Scale Technologies", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null - }, - "probes": [ - { - "device_type": "Ephys probe", - "name": "Probe A", - "serial_number": "9291019", - "manufacturer": null, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "probe_model": "Neuropixels 1.0", - "lasers": [], - "headstage": null - } - ] - }, - { - "name": "Ephys_assemblyB", - "device_type": "Ephys assembly", - "manipulator": { - "device_type": "Manipulator", - "name": "Manipulator B", - "serial_number": "SN2939", - "manufacturer": { - "name": "New Scale Technologies", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null - }, - "probes": [ - { - "device_type": "Ephys probe", - "name": "Probe B", - "serial_number": "9291020", - "manufacturer": null, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "probe_model": "Neuropixels 1.0", - "lasers": [], - "headstage": null - } - ] - }, - { - "name": "Face Camera Assembly", - "device_type": "Camera assembly", - "camera_target": "Face side left", - "camera": { - "device_type": "Detector", - "name": "Face Camera", - "serial_number": null, - "manufacturer": { - "name": "Teledyne FLIR", - "abbreviation": "FLIR", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "detector_type": "Camera", - "data_interface": "USB", - "cooling": "None", - "computer_name": "W10DT72941", - "frame_rate": "50", - "frame_rate_unit": "hertz", - "immersion": null, - "chroma": "Monochrome", - "sensor_width": 1080, - "sensor_height": 570, - "size_unit": "pixel", - "sensor_format": "1/2.9", - "sensor_format_unit": "inches", - "bit_depth": null, - "bin_mode": "None", - "bin_width": null, - "bin_height": null, - "bin_unit": "pixel", - "gain": null, - "crop_offset_x": null, - "crop_offset_y": null, - "crop_width": null, - "crop_height": null, - "crop_unit": "pixel", - "recording_software": null, - "driver": null, - "driver_version": null - }, - "lens": { - "device_type": "Lens", - "name": "Camera lens", - "serial_number": null, - "manufacturer": { - "name": "Edmund Optics", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "focal_length": "15", - "focal_length_unit": "millimeter", - "size": null, - "lens_size_unit": "inch", - "optimized_wavelength_range": null, - "wavelength_unit": "nanometer", - "max_aperture": "f/2" - }, - "filter": { - "device_type": "Filter", - "name": "LP filter", - "serial_number": null, - "manufacturer": { - "name": "Thorlabs", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "04gsnvb07" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "filter_type": "Long pass", - "diameter": null, - "width": null, - "height": null, - "size_unit": "millimeter", - "thickness": null, - "thickness_unit": null, - "filter_wheel_index": null, - "cut_off_wavelength": null, - "cut_on_wavelength": null, - "center_wavelength": null, - "wavelength_unit": "nanometer", - "description": "850 nm longpass filter" - }, - "position": null - }, - { - "name": "Body Camera Assembly", - "device_type": "Camera assembly", - "camera_target": "Body", - "camera": { - "device_type": "Detector", - "name": "Body Camera", - "serial_number": null, - "manufacturer": { - "name": "Teledyne FLIR", - "abbreviation": "FLIR", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "detector_type": "Camera", - "data_interface": "USB", - "cooling": "None", - "computer_name": "W10DT72941", - "frame_rate": "50", - "frame_rate_unit": "hertz", - "immersion": null, - "chroma": "Monochrome", - "sensor_width": 1080, - "sensor_height": 570, - "size_unit": "pixel", - "sensor_format": "1/2.9", - "sensor_format_unit": "inches", - "bit_depth": null, - "bin_mode": "None", - "bin_width": null, - "bin_height": null, - "bin_unit": "pixel", - "gain": null, - "crop_offset_x": null, - "crop_offset_y": null, - "crop_width": null, - "crop_height": null, - "crop_unit": "pixel", - "recording_software": null, - "driver": null, - "driver_version": null - }, - "lens": { - "device_type": "Lens", - "name": "Camera lens", - "serial_number": null, - "manufacturer": { - "name": "Edmund Optics", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "focal_length": "15", - "focal_length_unit": "millimeter", - "size": null, - "lens_size_unit": "inch", - "optimized_wavelength_range": null, - "wavelength_unit": "nanometer", - "max_aperture": "f/2" - }, - "filter": { - "device_type": "Filter", - "name": "LP filter", - "serial_number": null, - "manufacturer": { - "name": "Thorlabs", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "04gsnvb07" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "filter_type": "Long pass", - "diameter": null, - "width": null, - "height": null, - "size_unit": "millimeter", - "thickness": null, - "thickness_unit": null, - "filter_wheel_index": null, - "cut_off_wavelength": null, - "cut_on_wavelength": null, - "center_wavelength": null, - "wavelength_unit": "nanometer", - "description": "850 nm longpass filter" - }, - "position": null - }, - { - "name": "Laser_assemblyA", - "device_type": "Laser assembly", - "manipulator": { - "device_type": "Manipulator", - "name": "Manipulator A", - "serial_number": "SN2937", - "manufacturer": { - "name": "New Scale Technologies", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null - }, - "lasers": [ - { - "device_type": "Laser", - "name": "Red Laser", - "serial_number": null, - "manufacturer": { - "name": "Oxxius", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "wavelength": 473, - "wavelength_unit": "nanometer", - "maximum_power": null, - "power_unit": "milliwatt", - "coupling": null, - "coupling_efficiency": null, - "coupling_efficiency_unit": "percent", - "item_number": null - }, - { - "device_type": "Laser", - "name": "Blue Laser", - "serial_number": null, - "manufacturer": { - "name": "Oxxius", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "wavelength": 638, - "wavelength_unit": "nanometer", - "maximum_power": null, - "power_unit": "milliwatt", - "coupling": null, - "coupling_efficiency": null, - "coupling_efficiency_unit": "percent", - "item_number": null - } - ], - "collimator": { - "device_type": "device", - "name": "Collimator A", - "serial_number": null, - "manufacturer": null, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null - }, - "fiber": { - "device_type": "Patch", - "name": "Bundle Branching Fiber-optic Patch Cord", - "serial_number": null, - "manufacturer": { - "name": "Doric", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "059n53q30" - }, - "model": "BBP(4)_200/220/900-0.37_Custom_FCM-4xMF1.25", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "core_diameter": "200", - "numerical_aperture": "0.37", - "photobleaching_date": null - } - }, - { - "device_type": "Neuropixels basestation", - "name": "Basestation Slot 3", - "serial_number": null, - "manufacturer": { - "name": "Interuniversity Microelectronics Center", - "abbreviation": "IMEC", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "02kcbn207" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "data_interface": "PXI", - "computer_name": "W10DT72942", - "channels": [], - "firmware_version": null, - "hardware_version": null, - "basestation_firmware_version": "2.019", - "bsc_firmware_version": "2.199", - "slot": 3, - "ports": [ - { - "index": 1, - "probes": [ - "Probe A" - ] - }, - { - "index": 2, - "probes": [ - "Probe B" - ] - } - ] - }, - { - "device_type": "Harp device", - "name": "Harp Behavior", - "serial_number": null, - "manufacturer": { - "name": "Open Ephys Production Site", - "abbreviation": "OEPS", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "007rkz355" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "data_interface": "USB", - "computer_name": "W10DT72941", - "channels": [ - { - "channel_name": "DO0", - "device_name": "Face Camera", - "channel_type": "Digital Output", - "port": null, - "channel_index": null, - "sample_rate": null, - "sample_rate_unit": null, - "event_based_sampling": null - }, - { - "channel_name": "DO1", - "device_name": "Body Camera", - "channel_type": "Digital Output", - "port": null, - "channel_index": null, - "sample_rate": null, - "sample_rate_unit": null, - "event_based_sampling": null - }, - { - "channel_name": "AI0", - "device_name": "Running Wheel", - "channel_type": "Analog Input", - "port": null, - "channel_index": null, - "sample_rate": null, - "sample_rate_unit": null, - "event_based_sampling": null - } - ], - "firmware_version": null, - "hardware_version": null, - "harp_device_type": { - "whoami": 1216, - "name": "Behavior" - }, - "core_version": "2.1", - "tag_version": null, - "is_clock_generator": false - }, - { - "name": "Stick_assembly_1", - "device_type": "Camera assembly", - "camera_target": "Brain surface", - "camera": { - "device_type": "Detector", - "name": "stick microscope 1", - "serial_number": null, - "manufacturer": { - "name": "Teledyne FLIR", - "abbreviation": "FLIR", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "detector_type": "Camera", - "data_interface": "USB", - "cooling": "None", - "computer_name": "W10DT72942", - "frame_rate": "50", - "frame_rate_unit": "hertz", - "immersion": null, - "chroma": "Color", - "sensor_width": 1080, - "sensor_height": 570, - "size_unit": "pixel", - "sensor_format": "1/2.9", - "sensor_format_unit": "inches", - "bit_depth": null, - "bin_mode": "None", - "bin_width": null, - "bin_height": null, - "bin_unit": "pixel", - "gain": null, - "crop_offset_x": null, - "crop_offset_y": null, - "crop_width": null, - "crop_height": null, - "crop_unit": "pixel", - "recording_software": null, - "driver": null, - "driver_version": null - }, - "lens": { - "device_type": "Lens", - "name": "Probe lens", - "serial_number": null, - "manufacturer": { - "name": "Edmund Optics", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "focal_length": null, - "focal_length_unit": null, - "size": null, - "lens_size_unit": "inch", - "optimized_wavelength_range": null, - "wavelength_unit": "nanometer", - "max_aperture": null - }, - "filter": null, - "position": null - }, - { - "name": "Stick_assembly_2", - "device_type": "Camera assembly", - "camera_target": "Brain surface", - "camera": { - "device_type": "Detector", - "name": "stick microscope 2", - "serial_number": null, - "manufacturer": { - "name": "Teledyne FLIR", - "abbreviation": "FLIR", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "detector_type": "Camera", - "data_interface": "USB", - "cooling": "None", - "computer_name": "W10DT72942", - "frame_rate": "50", - "frame_rate_unit": "hertz", - "immersion": null, - "chroma": "Color", - "sensor_width": 1080, - "sensor_height": 570, - "size_unit": "pixel", - "sensor_format": "1/2.9", - "sensor_format_unit": "inches", - "bit_depth": null, - "bin_mode": "None", - "bin_width": null, - "bin_height": null, - "bin_unit": "pixel", - "gain": null, - "crop_offset_x": null, - "crop_offset_y": null, - "crop_width": null, - "crop_height": null, - "crop_unit": "pixel", - "recording_software": null, - "driver": null, - "driver_version": null - }, - "lens": { - "device_type": "Lens", - "name": "Probe lens", - "serial_number": null, - "manufacturer": { - "name": "Edmund Optics", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "focal_length": null, - "focal_length_unit": null, - "size": null, - "lens_size_unit": "inch", - "optimized_wavelength_range": null, - "wavelength_unit": "nanometer", - "max_aperture": null - }, - "filter": null, - "position": null - }, - { - "name": "Stick_assembly_3", - "device_type": "Camera assembly", - "camera_target": "Brain surface", - "camera": { - "device_type": "Detector", - "name": "stick microscope 3", - "serial_number": null, - "manufacturer": { - "name": "Teledyne FLIR", - "abbreviation": "FLIR", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "detector_type": "Camera", - "data_interface": "USB", - "cooling": "None", - "computer_name": "W10DT72942", - "frame_rate": "50", - "frame_rate_unit": "hertz", - "immersion": null, - "chroma": "Color", - "sensor_width": 1080, - "sensor_height": 570, - "size_unit": "pixel", - "sensor_format": "1/2.9", - "sensor_format_unit": "inches", - "bit_depth": null, - "bin_mode": "None", - "bin_width": null, - "bin_height": null, - "bin_unit": "pixel", - "gain": null, - "crop_offset_x": null, - "crop_offset_y": null, - "crop_width": null, - "crop_height": null, - "crop_unit": "pixel", - "recording_software": null, - "driver": null, - "driver_version": null - }, - "lens": { - "device_type": "Lens", - "name": "Probe lens", - "serial_number": null, - "manufacturer": { - "name": "Edmund Optics", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "focal_length": null, - "focal_length_unit": null, - "size": null, - "lens_size_unit": "inch", - "optimized_wavelength_range": null, - "wavelength_unit": "nanometer", - "max_aperture": null - }, - "filter": null, - "position": null - }, - { - "name": "Stick_assembly_4", - "device_type": "Camera assembly", - "camera_target": "Brain surface", - "camera": { - "device_type": "Detector", - "name": "stick microscope 4", - "serial_number": null, - "manufacturer": { - "name": "Teledyne FLIR", - "abbreviation": "FLIR", - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "detector_type": "Camera", - "data_interface": "USB", - "cooling": "None", - "computer_name": "W10DT72942", - "frame_rate": "50", - "frame_rate_unit": "hertz", - "immersion": null, - "chroma": "Color", - "sensor_width": 1080, - "sensor_height": 570, - "size_unit": "pixel", - "sensor_format": "1/2.9", - "sensor_format_unit": "inches", - "bit_depth": null, - "bin_mode": "None", - "bin_width": null, - "bin_height": null, - "bin_unit": "pixel", - "gain": null, - "crop_offset_x": null, - "crop_offset_y": null, - "crop_width": null, - "crop_height": null, - "crop_unit": "pixel", - "recording_software": null, - "driver": null, - "driver_version": null - }, - "lens": { - "device_type": "Lens", - "name": "Probe lens", - "serial_number": null, - "manufacturer": { - "name": "Edmund Optics", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "01j1gwp17" - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "focal_length": null, - "focal_length_unit": null, - "size": null, - "lens_size_unit": "inch", - "optimized_wavelength_range": null, - "wavelength_unit": "nanometer", - "max_aperture": null - }, - "filter": null, - "position": null - } - ] -} \ No newline at end of file diff --git a/examples/exaspim_rig.py b/examples/exaspim_instrument.py similarity index 100% rename from examples/exaspim_rig.py rename to examples/exaspim_instrument.py diff --git a/examples/exaspim_rig.json b/examples/exaspim_rig.json deleted file mode 100644 index dc5217382..000000000 --- a/examples/exaspim_rig.json +++ /dev/null @@ -1,452 +0,0 @@ -{ - "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py", - "schema_version": "1.0.5", - "rig_id": "440_exaSPIM1_20231004", - "mouse_platform": null, - "modification_date": "2023-10-04", - "calibrations": null, - "ccf_coordinate_transform": null, - "origin": null, - "rig_axes": null, - "modalities": [ - { - "name": "Selective plane illumination microscopy", - "abbreviation": "SPIM" - } - ], - "com_ports": [ - { - "hardware_name": "Laser Launch", - "com_port": "COM2" - }, - { - "hardware_name": "ASI Tiger", - "com_port": "COM5" - } - ], - "instrument_type": "exaSPIM", - "manufacturer": { - "name": "Custom", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "temperature_control": false, - "notes": null, - "connections": [], - "components": [ - { - "device_type": "Objective", - "name": "Custom Objective", - "serial_number": null, - "manufacturer": { - "name": "Other", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": "JM_DIAMOND 5.0X/1.3", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": "manufacturer collaboration between Schneider-Kreuznach and Vieworks", - "numerical_aperture": "0.305", - "magnification": "5", - "immersion": "air", - "objective_type": null - }, - { - "device_type": "Detector", - "name": "Camera 1", - "serial_number": "MB151BAY001", - "manufacturer": { - "name": "Vieworks", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": "VNP-604MX", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "detector_type": "Camera", - "data_interface": "Coax", - "cooling": "Air", - "computer_name": null, - "frame_rate": null, - "frame_rate_unit": null, - "immersion": null, - "chroma": null, - "sensor_width": null, - "sensor_height": null, - "size_unit": "pixel", - "sensor_format": null, - "sensor_format_unit": null, - "bit_depth": null, - "bin_mode": "None", - "bin_width": null, - "bin_height": null, - "bin_unit": "pixel", - "gain": null, - "crop_offset_x": null, - "crop_offset_y": null, - "crop_width": null, - "crop_height": null, - "crop_unit": "pixel", - "recording_software": null, - "driver": null, - "driver_version": null - }, - { - "device_type": "Laser", - "name": "LAS-08307", - "serial_number": "LAS-08307", - "manufacturer": { - "name": "Oxxius", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": "Housed in commercial laser combiner", - "wavelength": 405, - "wavelength_unit": "nanometer", - "maximum_power": "200", - "power_unit": "milliwatt", - "coupling": "Single-mode fiber", - "coupling_efficiency": null, - "coupling_efficiency_unit": "percent", - "item_number": null - }, - { - "device_type": "Laser", - "name": "LAS-08308", - "serial_number": "LAS-08308", - "manufacturer": { - "name": "Oxxius", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": "Housed in commercial laser combiner", - "wavelength": 488, - "wavelength_unit": "nanometer", - "maximum_power": "200", - "power_unit": "milliwatt", - "coupling": "Single-mode fiber", - "coupling_efficiency": null, - "coupling_efficiency_unit": "percent", - "item_number": null - }, - { - "device_type": "Laser", - "name": "539251", - "serial_number": "539251", - "manufacturer": { - "name": "Oxxius", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": "Housed in commercial laser combiner", - "wavelength": 561, - "wavelength_unit": "nanometer", - "maximum_power": "200", - "power_unit": "milliwatt", - "coupling": "Single-mode fiber", - "coupling_efficiency": null, - "coupling_efficiency_unit": "percent", - "item_number": null - }, - { - "device_type": "Laser", - "name": "LAS-08309", - "serial_number": "LAS-08309", - "manufacturer": { - "name": "Oxxius", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": null, - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": "Housed in commercial laser combiner", - "wavelength": 638, - "wavelength_unit": "nanometer", - "maximum_power": "200", - "power_unit": "milliwatt", - "coupling": "Single-mode fiber", - "coupling_efficiency": null, - "coupling_efficiency_unit": "percent", - "item_number": null - }, - { - "device_type": "Filter", - "name": "Multiband filter", - "serial_number": null, - "manufacturer": { - "name": "Chroma", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": "ZET405/488/561/640mv2", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": "Custom made filter", - "filter_type": "Multiband", - "diameter": "44.05", - "width": null, - "height": null, - "size_unit": "millimeter", - "thickness": "1", - "thickness_unit": "millimeter", - "filter_wheel_index": 0, - "cut_off_wavelength": null, - "cut_on_wavelength": null, - "center_wavelength": null, - "wavelength_unit": "nanometer", - "description": null - }, - { - "device_type": "DAQ Device", - "name": "Dev2", - "serial_number": null, - "manufacturer": { - "name": "National Instruments", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "026exqw73" - }, - "model": "PCIe-6738", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "data_interface": "USB", - "computer_name": "Dev2", - "channels": [ - { - "channel_name": "3", - "device_name": "LAS-08308", - "channel_type": "Analog Output", - "port": null, - "channel_index": null, - "sample_rate": "10000", - "sample_rate_unit": "hertz", - "event_based_sampling": null - }, - { - "channel_name": "5", - "device_name": "539251", - "channel_type": "Analog Output", - "port": null, - "channel_index": null, - "sample_rate": "10000", - "sample_rate_unit": "hertz", - "event_based_sampling": null - }, - { - "channel_name": "4", - "device_name": "LAS-08309", - "channel_type": "Analog Output", - "port": null, - "channel_index": null, - "sample_rate": "10000", - "sample_rate_unit": "hertz", - "event_based_sampling": null - }, - { - "channel_name": "2", - "device_name": "stage-x", - "channel_type": "Analog Output", - "port": null, - "channel_index": null, - "sample_rate": "10000", - "sample_rate_unit": "hertz", - "event_based_sampling": null - }, - { - "channel_name": "0", - "device_name": "TL-1", - "channel_type": "Analog Output", - "port": null, - "channel_index": null, - "sample_rate": "10000", - "sample_rate_unit": "hertz", - "event_based_sampling": null - }, - { - "channel_name": "6", - "device_name": "LAS-08307", - "channel_type": "Analog Output", - "port": null, - "channel_index": null, - "sample_rate": "10000", - "sample_rate_unit": "hertz", - "event_based_sampling": null - } - ], - "firmware_version": null, - "hardware_version": null - }, - { - "device_type": "Scanning stage", - "name": "stage-x", - "serial_number": null, - "manufacturer": { - "name": "Applied Scientific Instrumentation", - "abbreviation": "ASI", - "registry": null, - "registry_identifier": null - }, - "model": "MS-8000", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "travel": "1000", - "travel_unit": "millimeter", - "firmware": null, - "stage_axis_direction": "Detection axis", - "stage_axis_name": "X" - }, - { - "device_type": "Scanning stage", - "name": "stage-y", - "serial_number": null, - "manufacturer": { - "name": "Applied Scientific Instrumentation", - "abbreviation": "ASI", - "registry": null, - "registry_identifier": null - }, - "model": "MS-8000", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "travel": "1000", - "travel_unit": "millimeter", - "firmware": null, - "stage_axis_direction": "Perpendicular axis", - "stage_axis_name": "Y" - }, - { - "device_type": "Scanning stage", - "name": "stage-z", - "serial_number": null, - "manufacturer": { - "name": "Applied Scientific Instrumentation", - "abbreviation": "ASI", - "registry": null, - "registry_identifier": null - }, - "model": "LS-100", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "travel": "100", - "travel_unit": "millimeter", - "firmware": null, - "stage_axis_direction": "Illumination axis", - "stage_axis_name": "Z" - }, - { - "device_type": "Additional imaging device", - "name": "TL-1", - "serial_number": "01", - "manufacturer": { - "name": "Optotune", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": "EL-16-40-TC-VIS-20D-C", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "imaging_device_type": "Tunable lens" - }, - { - "device_type": "Additional imaging device", - "name": "RM-1", - "serial_number": "01", - "manufacturer": { - "name": "Thorlabs", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "04gsnvb07" - }, - "model": "K10CR1", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "imaging_device_type": "Rotation mount" - }, - { - "device_type": "Additional imaging device", - "name": "LC-1", - "serial_number": "L6CC-00513", - "manufacturer": { - "name": "Oxxius", - "abbreviation": null, - "registry": null, - "registry_identifier": null - }, - "model": "L6Cc", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "imaging_device_type": "Laser combiner" - }, - { - "device_type": "Optical table", - "name": "Table", - "serial_number": null, - "manufacturer": { - "name": "MKS Newport", - "abbreviation": null, - "registry": { - "name": "Research Organization Registry", - "abbreviation": "ROR" - }, - "registry_identifier": "00k17f049" - }, - "model": "VIS3648-PG2-325A", - "path_to_cad": null, - "port_index": null, - "additional_settings": null, - "notes": null, - "length": "36", - "width": "48", - "table_size_unit": "inch", - "vibration_control": true - } - ] -} \ No newline at end of file diff --git a/examples/fip_behavior_rig.json b/examples/fip_behavior_instrument.json similarity index 99% rename from examples/fip_behavior_rig.json rename to examples/fip_behavior_instrument.json index 2013c29d9..c4f0194c7 100644 --- a/examples/fip_behavior_rig.json +++ b/examples/fip_behavior_instrument.json @@ -1,7 +1,7 @@ { - "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py", - "schema_version": "1.0.5", - "rig_id": "447_FIP-Behavior_20000101", + "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/inst.py", + "schema_version": "2.0.0", + "instrument_id": "447_FIP-Behavior_20000101", "mouse_platform": { "device_type": "Tube", "name": "mouse_tube_foraging", @@ -70,7 +70,7 @@ ], "ccf_coordinate_transform": null, "origin": null, - "rig_axes": null, + "instrument_axes": null, "modalities": [ { "name": "Behavior", diff --git a/examples/fip_behavior_rig.py b/examples/fip_behavior_instrument.py similarity index 100% rename from examples/fip_behavior_rig.py rename to examples/fip_behavior_instrument.py diff --git a/examples/fip_ophys_rig.json b/examples/fip_ophys_instrument.json similarity index 99% rename from examples/fip_ophys_rig.json rename to examples/fip_ophys_instrument.json index 5409a1989..985d44f91 100644 --- a/examples/fip_ophys_rig.json +++ b/examples/fip_ophys_instrument.json @@ -1,7 +1,7 @@ { - "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/rig.py", - "schema_version": "1.0.5", - "rig_id": "428_FIP1_20231003", + "describedBy": "https://raw.githubusercontent.com/AllenNeuralDynamics/aind-data-schema/main/src/aind_data_schema/core/inst.py", + "schema_version": "2.0.0", + "instrument_id": "428_FIP1_20231003", "mouse_platform": { "device_type": "Disc", "name": "mouse_disc", @@ -46,7 +46,7 @@ ], "ccf_coordinate_transform": null, "origin": null, - "rig_axes": null, + "instrument_axes": null, "modalities": [ { "name": "Fiber photometry", diff --git a/examples/fip_ophys_rig.py b/examples/fip_ophys_instrument.py similarity index 100% rename from examples/fip_ophys_rig.py rename to examples/fip_ophys_instrument.py diff --git a/tests/test_inst_acq_compatibility.py b/tests/test_inst_acq_compatibility.py index 39735d3a1..5e27aa1cc 100644 --- a/tests/test_inst_acq_compatibility.py +++ b/tests/test_inst_acq_compatibility.py @@ -1,4 +1,4 @@ -"""Tests rig session compatibility check""" +"""Tests instrument session compatibility check""" import json import unittest