Skip to content

Commit bd2fce4

Browse files
committed
also xrm files
1 parent e24e47a commit bd2fce4

2 files changed

Lines changed: 13 additions & 14 deletions

File tree

src/murfey/client/analyser.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,11 @@ def _find_extension(self, file_path: Path) -> bool:
112112
self._extension = Path(subframe_path).suffix
113113
return True
114114
# Check for LIF files and TXRM files separately
115-
elif file_path.suffix == ".lif" or file_path.suffix == ".txrm":
115+
elif (
116+
file_path.suffix == ".lif"
117+
or file_path.suffix == ".txrm"
118+
or file_path.suffix == ".xrm"
119+
):
116120
self._extension = file_path.suffix
117121
return True
118122
return False
@@ -140,7 +144,7 @@ def _find_context(self, file_path: Path) -> bool:
140144
return True
141145

142146
# SXT workflow checks
143-
if file_path.suffix == ".txrm":
147+
if file_path.suffix in (".txrm", ".xrm"):
144148
self._context = SXTContext("zeiss", self._basepath, self._token)
145149
return True
146150

src/murfey/client/contexts/sxt.py

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -57,19 +57,14 @@ def register_sxt_data_collection(
5757
"data_collection_tag": tilt_series,
5858
"source": str(self._basepath),
5959
"tag": tilt_series,
60+
"pixel_size_on_image": str(
61+
data_collection_parameters.get("pixel_size_on_image", 100)
62+
),
63+
"image_size_x": data_collection_parameters.get("image_size_x", 0),
64+
"image_size_y": data_collection_parameters.get("image_size_y", 0),
65+
"magnification": data_collection_parameters.get("magnification", 0),
66+
"voltage": 0,
6067
}
61-
62-
# Once mdoc parameters are known register processing jobs
63-
dc_data.update(
64-
{
65-
"pixel_size_on_image": data_collection_parameters.get(
66-
"pixel_size_on_image"
67-
),
68-
"image_size_x": data_collection_parameters.get("image_size_x"),
69-
"image_size_y": data_collection_parameters.get("image_size_y"),
70-
"magnification": data_collection_parameters.get("magnification"),
71-
}
72-
)
7368
capture_post(
7469
base_url=str(environment.url.geturl()),
7570
router_name="workflow.router",

0 commit comments

Comments
 (0)