Skip to content

Try to fix the data collection group tag again #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
d-j-hatton merged 1 commit into from
Jan 30, 2025
Merged

Try to fix the data collection group tag again #472

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 19 additions & 3 deletions src/murfey/client/contexts/spa_metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down