Merge pull request #813 from AllenNeuralDynamics/feat-802-optional-new

cooling and rig axes option

Author: saskiad

examples/ephys_rig.json

@@ -47,7 +47,7 @@
             "notes": null,
             "detector_type": "Camera",
             "data_interface": "USB",
-            "cooling": null,
+            "cooling": "None",
             "computer_name": "W10DT72941",
             "max_frame_rate": "500",
             "frame_rate_unit": "hertz",
@@ -154,7 +154,7 @@
             "notes": null,
             "detector_type": "Camera",
             "data_interface": "USB",
-            "cooling": null,
+            "cooling": "None",
             "computer_name": "W10DT72941",
             "max_frame_rate": "500",
             "frame_rate_unit": "hertz",
@@ -337,7 +337,7 @@
             "notes": null,
             "detector_type": "Camera",
             "data_interface": "USB",
-            "cooling": null,
+            "cooling": "None",
             "computer_name": "W10DT72942",
             "max_frame_rate": "50",
             "frame_rate_unit": "hertz",
@@ -621,7 +621,7 @@
    ],
    "ccf_coordinate_transform": null,
    "origin": null,
-   "rig_axes": [],
+   "rig_axes": null,
    "modalities": [
       {
          "name": "Extracellular electrophysiology",

examples/fip_ophys_rig.json

@@ -877,7 +877,7 @@
    ],
    "ccf_coordinate_transform": null,
    "origin": null,
-   "rig_axes": [],
+   "rig_axes": null,
    "modalities": [
       {
          "name": "Fiber photometry",

src/aind_data_schema/core/rig.py

@@ -78,7 +78,7 @@ class Rig(AindCoreModel):
         description="Path to file that details the CCF-to-lab coordinate transform",
     )
     origin: Optional[Origin] = Field(None, title="Origin point for rig position transforms")
-    rig_axes: Optional[List[Axis]] = Field(default=[], title="Rig axes", min_length=3, max_length=3)
+    rig_axes: Optional[List[Axis]] = Field(None, title="Rig axes", min_length=3, max_length=3)
     modalities: Set[Modality.ONE_OF] = Field(..., title="Modalities")
     notes: Optional[str] = Field(None, title="Notes")
 

src/aind_data_schema/models/devices.py

@@ -193,6 +193,7 @@ class Cooling(str, Enum):
 
     AIR = "Air"
     WATER = "Water"
+    NONE = "None"
 
 
 class BinMode(str, Enum):
@@ -292,7 +293,7 @@ class Detector(Device):
     detector_type: DetectorType = Field(..., title="Detector Type")
     manufacturer: Organization.DETECTOR_MANUFACTURERS
     data_interface: DataInterface = Field(..., title="Data interface")
-    cooling: Cooling = Field(None, title="Cooling")
+    cooling: Cooling = Field(Cooling.NONE, title="Cooling")
     computer_name: Optional[str] = Field(None, title="Name of computer receiving data from this camera")
     max_frame_rate: Optional[Decimal] = Field(None, title="Maximum frame rate (Hz)")
     frame_rate_unit: FrequencyUnit = Field(FrequencyUnit.HZ, title="Frame rate unit")