Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion src/murfey/client/multigrid_control.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from murfey.client.rsync import RSyncer, RSyncerUpdate, TransferResult
from murfey.client.tui.screens import determine_default_destination
from murfey.client.watchdir import DirWatcher
from murfey.util import capture_post, posix_path
from murfey.util import capture_post, get_machine_config_client, posix_path

log = logging.getLogger("murfey.client.mutligrid_control")

Expand Down Expand Up @@ -71,6 +71,11 @@ def __post_init__(self):
instrument_name=self.instrument_name,
# processing_only_mode=server_routing_prefix_found,
)
self._machine_config = get_machine_config_client(
str(self._environment.url.geturl()),
instrument_name=self._environment.instrument_name,
demo=self._environment.demo,
)
self._data_suffixes = (".mrc", ".tiff", ".tif", ".eer")
self._data_substrings = [
s
Expand Down
1 change: 1 addition & 0 deletions src/murfey/server/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2569,6 +2569,7 @@ def feedback_callback(header: dict, message: dict) -> None:
message["atlas_pixel_size"],
message["sample"],
)
return None
elif message["register"] == "data_collection":
murfey_session_id = message["session_id"]
ispyb_session_id = murfey.server.ispyb.get_session_id(
Expand Down
3 changes: 2 additions & 1 deletion src/murfey/workflows/spa/flush_spa_preprocess.py
Original file line number Diff line number Diff line change
Expand Up @@ -187,10 +187,11 @@ def register_foil_hole(
pixel_size=foil_hole_params.pixel_size,
image=str(secured_foil_hole_image_path),
)
fh_id = foil_hole.id
murfey_db.add(foil_hole)
murfey_db.commit()
murfey_db.close()
return foil_hole.id
return fh_id


def _grid_square_metadata_file(f: Path, grid_square: int) -> Optional[Path]:
Expand Down