Skip to content

Commit 678a2a3

Browse files
committed
Updated some field names, added some fields, and added docstrings explaining the contents of 'StagePositionInfo'
1 parent 9e94cd2 commit 678a2a3

1 file changed

Lines changed: 32 additions & 5 deletions

File tree

src/murfey/util/models.py

Lines changed: 32 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,11 +116,33 @@ def slot_number(self) -> int | None:
116116

117117

118118
class StagePositionInfo(BaseModel):
119-
thinning: StagePositionValues | None = None
120-
chunk_coincidence: StagePositionValues | None = None
121-
thinning_stage: StagePositionValues | None = None
122-
preparation: StagePositionValues | None = None
123-
chunk_site: StagePositionValues | None = None
119+
"""
120+
Stage position values associated with the different stages of the milling
121+
process. The XML paths they're associated with (with "Site" as the parent
122+
node) are indicated in the comments.
123+
124+
The image acquisition steps have a "SiteLocationType" field that appear to
125+
be associated with either "ChunkSiteLocation" or "ThinningSiteLocation".
126+
"ThinningStagePosition" appears to be a duplicate of "ThinningSiteLocation"
127+
so far, and it is unclearf for now what stages "PreparationSiteLocation"
128+
and "ChunkCoincidenceStagePosition" currently correspond to.
129+
"""
130+
131+
preparation: StagePositionValues | None = (
132+
None # PreparationSiteLocation/StagePosition/StagePosition
133+
)
134+
chunk_coincidence: StagePositionValues | None = (
135+
None # Parameters/ChunkCoincidenceStagePosition/StagePosition
136+
)
137+
chunk: StagePositionValues | None = (
138+
None # ChunkSiteLocation/StagePosition/StagePosition
139+
)
140+
thinning_1: StagePositionValues | None = (
141+
None # Parameters/ThinningStagePosition/StagePosition
142+
)
143+
thinning_2: StagePositionValues | None = (
144+
None # ThinningSiteLocation/StagePosition/StagePosition
145+
)
124146

125147

126148
class MillingStepInfo(BaseModel):
@@ -130,10 +152,15 @@ class MillingStepInfo(BaseModel):
130152
"""
131153

132154
# Step setup
155+
step_name: str | None = None
156+
recipe_name: str | None = None
133157
is_enabled: bool | None = None
134158
status: str | None = None
135159
execution_time: float | None = None
136160

161+
# Associated stage position information
162+
site_location_type: str | None = None
163+
137164
# Beam info
138165
beam_type: str | None = None
139166
voltage: float | None = None

0 commit comments

Comments
 (0)