Skip to content

Commit e830f8c

Browse files
committed
Default gains should not have data in
1 parent 7601cb4 commit e830f8c

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

src/murfey/cli/spa_ispyb_messages.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@ def run():
223223
metadata["image_size_y"] = str(int(metadata["image_size_y"]) * binning_factor)
224224
metadata["motion_corr_binning"] = 1 if binning_factor_xml == 2 else 2
225225
metadata["gain_ref"] = (
226-
f"data/{datetime.now().year}/{args.visit}/processing/gain.mrc"
226+
f"{datetime.now().year}/{args.visit}/processing/gain.mrc"
227227
if args.gain_ref is None
228228
else args.gain_ref
229229
)
230230
metadata["gain_ref_superres"] = (
231-
f"data/{datetime.now().year}/{args.visit}/processing/gain_superres.mrc"
231+
f"{datetime.now().year}/{args.visit}/processing/gain_superres.mrc"
232232
if args.gain_ref_superres is None
233233
else args.gain_ref_superres
234234
)

src/murfey/client/contexts/spa.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -298,14 +298,14 @@ def gather_metadata(
298298
if environment
299299
and environment.data_collection_parameters.get("gain_ref")
300300
not in (None, "None")
301-
else f"data/{datetime.now().year}/{environment.visit}/processing/gain.mrc"
301+
else f"{datetime.now().year}/{environment.visit}/processing/gain.mrc"
302302
)
303303
metadata["gain_ref_superres"] = (
304304
environment.data_collection_parameters.get("gain_ref_superres")
305305
if environment
306306
and environment.data_collection_parameters.get("gain_ref_superres")
307307
not in (None, "None")
308-
else f"data/{datetime.now().year}/{environment.visit}/processing/gain_superres.mrc"
308+
else f"{datetime.now().year}/{environment.visit}/processing/gain_superres.mrc"
309309
)
310310
else:
311311
metadata["gain_ref"] = None

src/murfey/client/contexts/tomo.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -618,7 +618,7 @@ def gather_metadata(
618618
environment.data_collection_parameters.get("gain_ref")
619619
if environment.data_collection_parameters.get("gain_ref")
620620
not in (None, "None")
621-
else f"data/{datetime.now().year}/{environment.visit}/processing/gain.mrc"
621+
else f"{datetime.now().year}/{environment.visit}/processing/gain.mrc"
622622
)
623623
else:
624624
mdoc_metadata["gain_ref"] = None

0 commit comments

Comments
 (0)