Skip to content

Commit c0db7c2

Browse files
committed
Add additional columns to the 'ImagingSite' table to keep track of stage position, image field of view, and rotation
1 parent b84ecd7 commit c0db7c2

1 file changed

Lines changed: 24 additions & 9 deletions

File tree

src/murfey/util/db.py

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,6 @@ class ImagingSite(SQLModel, table=True): # type: ignore
107107
foreign_key="session.id", default=None, unique=False
108108
)
109109

110-
# Type of data (atlas/overview or grid square)
111-
data_type: Optional[str] = Field(default=None) # "atlas" or "grid_square"
112-
113110
# Link to data collection group
114111
data_collection_group: Optional["DataCollectionGroup"] = Relationship(
115112
back_populates="imaging_sites"
@@ -123,20 +120,38 @@ class ImagingSite(SQLModel, table=True): # type: ignore
123120
grid_square: Optional["GridSquare"] = Relationship(back_populates="imaging_sites")
124121
grid_square_id: Optional[int] = Field(foreign_key="gridsquare.id", default=None)
125122

123+
# Type of data (atlas/overview or grid square)
124+
data_type: Optional[str] = Field(default=None) # "atlas" or "grid_square"
125+
126+
# Stage position (image centre) and rotation
127+
stage_x: Optional[float] = Field(default=None)
128+
stage_y: Optional[float] = Field(default=None)
129+
stage_z: Optional[float] = Field(default=None)
130+
rotation: Optional[float] = Field(default=None)
131+
tilt_alpha: Optional[float] = Field(default=None)
132+
tilt_beta: Optional[float] = Field(default=None)
133+
134+
# Field and depth of view
135+
length_x: Optional[float] = Field(default=None)
136+
length_y: Optional[float] = Field(default=None)
137+
length_z: Optional[float] = Field(default=None)
138+
139+
# Extent of the imaged area in real space
140+
x0: Optional[float] = Field(default=None)
141+
x1: Optional[float] = Field(default=None)
142+
y0: Optional[float] = Field(default=None)
143+
y1: Optional[float] = Field(default=None)
144+
126145
# Shape and resolution information
127146
image_pixels_x: Optional[int] = Field(default=None)
128147
image_pixels_y: Optional[int] = Field(default=None)
129148
image_pixel_size: Optional[float] = Field(default=None)
130149
thumbnail_pixels_x: Optional[int] = Field(default=None)
131150
thumbnail_pixels_y: Optional[int] = Field(default=None)
132151
thumbnail_pixel_size: Optional[float] = Field(default=None)
133-
units: Optional[str] = Field(default=None)
134152

135-
# Extent of the imaged area in real space
136-
x0: Optional[float] = Field(default=None)
137-
x1: Optional[float] = Field(default=None)
138-
y0: Optional[float] = Field(default=None)
139-
y1: Optional[float] = Field(default=None)
153+
# Spatial units
154+
units: Optional[str] = Field(default=None)
140155

141156
# Colour channel-related fields
142157
number_of_members: Optional[int] = Field(default=None)

0 commit comments

Comments
 (0)