Make 'StagePositionInfo' attributes more indicative of where in the metadata they're from

Author: tieneupin

src/murfey/client/contexts/fib.py

@@ -162,11 +162,11 @@ def _parse_boolean(text: str):
 STAGE_POSITION_NAMES = {
     # Map class attribute to element name
     # Paths are relative to the "Site" node
-    "preparation": "PreparationSiteLocation/StagePosition/StagePosition",
-    "chunk": "ChunkSiteLocation/StagePosition/StagePosition",
-    "thinning_1": "ThinningSiteLocation/StagePosition/StagePosition",
-    "chunk_coincidence": "Parameters/ChunkCoincidenceStagePosition/StagePosition",
-    "thinning_2": "Parameters/ThinningStagePosition/StagePosition",
+    "preparation_site": "PreparationSiteLocation/StagePosition/StagePosition",
+    "chunk_site": "ChunkSiteLocation/StagePosition/StagePosition",
+    "thinning_site": "ThinningSiteLocation/StagePosition/StagePosition",
+    "chunk_coincidence_params": "Parameters/ChunkCoincidenceStagePosition/StagePosition",
+    "thinning_params": "Parameters/ThinningStagePosition/StagePosition",
 }
 
 

src/murfey/util/models.py

@@ -129,20 +129,20 @@ class StagePositionInfo(BaseModel):
     """
 
     # Top-level values
-    preparation: StagePositionValues | None = (
+    preparation_site: StagePositionValues | None = (
         None  # PreparationSiteLocation/StagePosition/StagePosition
     )
-    chunk: StagePositionValues | None = (
+    chunk_site: StagePositionValues | None = (
         None  # ChunkSiteLocation/StagePosition/StagePosition
     )
-    thinning_1: StagePositionValues | None = (
+    thinning_site: StagePositionValues | None = (
         None  # ThinningSiteLocation/StagePosition/StagePosition
     )
     # Stored under Parameters
-    chunk_coincidence: StagePositionValues | None = (
+    chunk_coincidence_params: StagePositionValues | None = (
         None  # Parameters/ChunkCoincidenceStagePosition/StagePosition
     )
-    thinning_2: StagePositionValues | None = (
+    thinning_params: StagePositionValues | None = (
         None  # Parameters/ThinningStagePosition/StagePosition
     )