From b50203ad60396c38efa199952266cb56803ee7ea Mon Sep 17 00:00:00 2001 From: Dan Hatton Date: Tue, 28 Jan 2025 18:57:09 +0000 Subject: [PATCH] Try to fix the data collection group tag again --- src/murfey/client/contexts/spa_metadata.py | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-) diff --git a/src/murfey/client/contexts/spa_metadata.py b/src/murfey/client/contexts/spa_metadata.py index f02ec71b3..993530786 100644 --- a/src/murfey/client/contexts/spa_metadata.py +++ b/src/murfey/client/contexts/spa_metadata.py @@ -150,8 +150,16 @@ def post_transfer( atlas=Path(partial_path), sample=sample ) url = f"{str(environment.url.geturl())}/visits/{environment.visit}/{environment.murfey_session}/register_data_collection_group" - dcg_tag = "/".join( - p for p in transferred_file.parent.parts if p != environment.visit + dcg_search_dir = "/".join( + p + for p in transferred_file.parent.parts[1:] + if p != environment.visit + ) + dcg_tag = str( + sorted( + Path(dcg_search_dir).glob("Images-Disc*"), + key=lambda x: x.stat().st_ctime, + )[-1] ) dcg_data = { "experiment_type": "single particle", @@ -195,7 +203,15 @@ def post_transfer( ) fh_positions = _foil_hole_positions(transferred_file, int(gs_name)) source = _get_source(transferred_file, environment=environment) - visitless_source = str(source).replace(f"/{environment.visit}", "") + visitless_source_search_dir = str(source).replace( + f"/{environment.visit}", "" + ) + visitless_source = str( + sorted( + Path(visitless_source_search_dir).glob("Images-Disc*"), + key=lambda x: x.stat().st_ctime, + )[-1] + ) for fh, fh_data in fh_positions.items(): capture_post( f"{str(environment.url.geturl())}/sessions/{environment.murfey_session}/grid_square/{gs_name}/foil_hole",