Skip to content

Commit a391919

Browse files
committed
Restore the lost parameters which may be needed
1 parent 135020a commit a391919

File tree

3 files changed

+13
-0
lines changed

3 files changed

+13
-0
lines changed

src/murfey/client/contexts/spa.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,8 @@ def gather_metadata(
265265
metadata["image_size_x"] = str(int(metadata["image_size_x"]) * binning_factor)
266266
metadata["image_size_y"] = str(int(metadata["image_size_y"]) * binning_factor)
267267
metadata["motion_corr_binning"] = 1 if binning_factor_xml == 2 else 2
268+
metadata["gain_ref"] = environment.gain_ref if environment else None
269+
metadata["dose_per_frame"] = environment.dose_per_frame if environment else None
268270
metadata["symmetry"] = (environment.symmetry if environment else None) or "C1"
269271
metadata["eer_fractionation"] = (
270272
environment.eer_fractionation if environment else None

src/murfey/client/contexts/tomo.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -600,6 +600,10 @@ def gather_metadata(
600600
float(mdoc_data["PixelSpacing"]) * 1e-10
601601
)
602602
mdoc_metadata["motion_corr_binning"] = binning_factor
603+
mdoc_metadata["gain_ref"] = environment.gain_ref if environment else None
604+
mdoc_metadata["dose_per_frame"] = (
605+
environment.dose_per_frame if environment else None
606+
)
603607
mdoc_metadata["source"] = str(self._basepath)
604608
mdoc_metadata["tag"] = str(self._basepath)
605609
mdoc_metadata["tilt_series_tag"] = metadata_file.stem
@@ -610,6 +614,9 @@ def gather_metadata(
610614
mdoc_metadata["file_extension"] = (
611615
f".{mdoc_data_block['SubFramePath'].split('.')[-1]}"
612616
)
617+
mdoc_metadata["eer_fractionation"] = (
618+
environment.eer_fractionation if environment else None
619+
) or 20
613620

614621
data_file = mdoc_data_block["SubFramePath"].split("\\")[-1]
615622
if data_file.split(".")[-1] == "eer":

src/murfey/client/multigrid_control.py

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -419,6 +419,10 @@ def _start_dc(self, json, from_form: bool = False):
419419
json = json.get("form", {})
420420
# Safely convert all entries into strings, but leave None as-is
421421
json = {k: str(v) if v is not None else None for k, v in json.items()}
422+
self._environment.dose_per_frame = json.get("dose_per_frame")
423+
self._environment.gain_ref = json.get("gain_ref")
424+
self._environment.symmetry = json.get("symmetry")
425+
self._environment.eer_fractionation = json.get("eer_fractionation")
422426
source = Path(json["source"])
423427
context = self.analysers[source]._context
424428
if context:

0 commit comments

Comments
 (0)