changes for David

Author: saskiad

src/aind_data_schema/device.py

@@ -12,7 +12,7 @@
 from aind_data_schema.coordinates import RelativePosition
 from aind_data_schema.manufacturers import Manufacturer
 from aind_data_schema.procedures import Reagent
-from aind_data_schema.utils.units import FrequencyUnit, PowerUnit, SizeUnit, TemperatureUnit
+from aind_data_schema.utils.units import FrequencyUnit, PowerUnit, SizeUnit, SpeedUnit, TemperatureUnit, UnitlessUnit
 
 
 class DeviceDriver(Enum):
@@ -593,7 +593,7 @@ class PolygonalScanner(Device):
 
     device_type: Literal["Polygonal Scanner"] = Field("Polygonal Scanner", const=True, readOnly=True)
     speed: int = Field(..., title="Speed (rpm)")
-    speed_unit: str = Field("Rotations per minute", title="Speed unit")
+    speed_unit: SpeedUnit = Field(SpeedUnit.RPM, title="Speed unit")
     number_faces: int = Field(..., title="Number of faces")
 
 
@@ -604,6 +604,7 @@ class PockelsCell(Device):
     polygonal_scanner: str = Field(..., title="Polygonal scanner", description="Must match name of Polygonal scanner")
     on_time: Decimal = Field(..., title="On time (fraction of cycle)")
     off_time: Decimal = Field(..., title="Off time (fraction of cycle)")
+    time_setting_unit: UnitlessUnit = Field(UnitlessUnit.FC, title="time setting unit")
 
 
 class MousePlatform(Device):

src/aind_data_schema/session.py

@@ -127,17 +127,17 @@ class Stack(AindModel):
     targeted_structure: Optional[str] = Field(None, title="Targeted structure")
 
 
-class SlapType(Enum):
+class SlapSessionType(Enum):
     """Type of slap session"""
 
     PARENT = "Parent"
     BRANCH = "Branch"
 
 
-class Slap(FieldOfView):
+class SlapFieldOfView(FieldOfView):
     """Description of a Slap2 scan"""
 
-    session_type: SlapType = Field(..., title="Session type")
+    session_type: SlapSessionType = Field(..., title="Session type")
     dmd_dilation_x: int = Field(..., title="DMD Dilation X (pixels)")
     dmd_dilation_y: int = Field(..., title="DMD Dilation Y (pixels)")
     dilation_unit: SizeUnit = Field(SizeUnit.PX, title="Dilation unit")
@@ -257,7 +257,7 @@ class Stream(AindModel):
     detectors: Optional[List[Detector]] = Field(None, title="Detectors", unique_items=True)
     fiber_photometry_assemblies: Optional[List[FiberPhotometryAssembly]] = Field(None, title="Fiber photometry devices")
     ophys_fovs: Optional[List[FieldOfView]] = Field(None, title="Fields of view", unique_items=True)
-    slap_fovs: Optional[Slap] = Field(None, title="Slap2 field of view")
+    slap_fovs: Optional[SlapFieldOfView] = Field(None, title="Slap2 field of view")
     stack_parameters: Optional[Stack] = Field(None, title="Stack parameters")
     stimulus_device_names: Optional[List[str]] = Field(None, title="Stimulus devices")
     notes: Optional[str] = Field(None, title="Notes")

src/aind_data_schema/utils/units.py

@@ -36,6 +36,12 @@ class FrequencyUnit(Enum):
     mHZ = "millihertz"
 
 
+class SpeedUnit(Enum):
+    """Enumeration of Speed Measurements"""
+
+    RPM = "rotations per minute"
+
+
 class VolumeUnit(Enum):
     """Enumeration of Volume Measurements"""
 
@@ -92,6 +98,13 @@ class TemperatureUnit(Enum):
     K = "Kelvin"
 
 
+class UnitlessUnit(Enum):
+    """Unitless options"""
+
+    PERCENT = "percent"
+    FC = "fraction of cycle"
+    
+
 def create_unit_with_value(model_name, scalar_type, unit_type, unit_default):
     """this uses create_model instead of generics, which lets us set default values"""