Skip to content

Pre-set beamshift before FastADT to avoid missing first frame #165

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

Open
Baharis wants to merge 5 commits into
base: main
Choose a base branch
from
+5 −1
Open

Pre-set beamshift before FastADT to avoid missing first frame #165

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
40f5365
You cannot `get_data_from_shared_memory` if data is an error report
Baharis May 30, 2026
2fb2616
Merge branch 'instamatic-dev:main' into main
Baharis Jun 3, 2026
9cf1a99
Merge branch 'instamatic-dev:main' into main
Baharis Jun 12, 2026
7e35ec5
Pre-set starting beamshift before experiment to avoid issues with fir…
Baharis Jul 18, 2026
10d85a4
Look for NaNs only after asserting columns exist
Baharis Jul 18, 2026
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
6 changes: 5 additions & 1 deletion src/instamatic/experiments/fast_adt/experiment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,9 @@ def buffer(self) -> list[tuple[int, np.ndarray, dict]]:

@property
def has_beamshifts(self) -> bool:
return {'beamshift_x', 'beamshift_y'}.issubset(self.table.columns)
columns = ['beamshift_x', 'beamshift_y']
columns_exist = set(columns).issubset(self.table.columns)
return columns_exist and not self.table[columns].isna().any().any()

@property
def osc_angle(self) -> float:
Expand Down Expand Up @@ -497,6 +499,8 @@ def pathing_save_to_files(self) -> None:

def collect_run(self, run: Run) -> None:
"""Collect `run.steps` and place them in `self.steps` Queue."""
if run.has_beamshifts:
self.ctrl.beamshift.set(*run.table[['beamshift_x', 'beamshift_y']].iloc[0])
with self.ctrl.beam.unblanked(delay=0.2):
if run.continuous:
self._collect_scans(run=run)
Expand Down
Loading