x01dc
e3ff5ffd48
Replace the plain self.progress dict with a global-var-backed _ProgressProxy (same shape and key as FlOMNI's), so progress survives a client restart. Adds heartbeat + idle-time-gap detection in _tomo_scan_at_angle, ETA computation in _print_progress, and tomo_start_time/reset handling in tomo_scan(). Adds tomo_progress_reset() and _format_duration() for parity. gui_tools.py's progress display already read these fields; no GUI change needed. feat(lamni): persist alignment lookup-table corrections corr_pos_x/corr_pos_y/corr_angle (+ _2 iteration) become global-var-backed properties (lamni_corr_pos_x, lamni_corr_pos_y, lamni_corr_angle, ..._2) instead of plain instance lists that reset on every client restart. No default correction file exists for LamNI, so reset_correction()/reset_correction_2() just clear to empty. feat(lamni): add frames_per_trigger (burst mode) support LamNIFermatScan already inherits from AsyncFlyScanBase and already accepts/passes through frames_per_trigger -- only the client-side plumbing was missing. Adds a validated, global-var-backed frames_per_trigger property, threads it into tomo_scan_projection()'s lamni_fermat_scan() call, and exposes it in tomo_parameters(). Also folds it into the idle-time cadence estimate alongside stitch tile count. feat(lamni): add crosshair and structured HDF5 output to X-ray eye alignment Set the alignment crosshair at the FZP centre (step k=0, raw pixel coords), hidden on normal completion and on Ctrl-C abort. update_frame() now actually captures and stores each frame (previously not stored at all); roi_pixel_data is now collected at every submit. write_output() additionally writes a timestamped HDF5 file (alignment_values, alignment_images, roi_pixel_data, alignment_fit) alongside the existing plain-text archival file. fix(lamni): stop resetting correction state on every XrayEyeAlign instantiation A fresh XrayEyeAlign is constructed on every call to both xrayeye_alignment_start() and xrayeye_update_frame(); resetting corr_pos_x/y/angle and tomo_fit_xray_eye in __init__ meant the latter -- meant as a lightweight frame check -- silently wiped valid persisted correction data every time. Reset moved to the start of align() itself. fix(lamni): use dev.fsh instead of dev.omnyfsh for the alignment shutter The shared XRayEye widget monitors and controls dev.fsh; the alignment script was opening/closing a different device, which would desync the GUI's shutter toggle from the actual hardware state. fix(lamni): correct stale self.align reference in MagLamNI.rotate_slowly self.align no longer exists as an attribute now that LamNIAlignmentMixin is mixed directly into LamNI. Use self.tomo_fovx_offset/self.tomo_fovy_offset directly.
cSAXS BEC
cSAXS specific plugins and configs for BEC This document guides you through the procedure to spin up BEC at the beamline for a new experiment (e-account). You might want to run cSAXS copy scripts before in case you want to have the former data structure to be preserved.
Overview
- Clone cSAXS BEC repository into e-account (e.g. into ~/Data10/software/.)
- Start Epics iocs
- Start BEC, BEC server and load/modify the device config with relevant hardware
- BEC commands
Clone cSAXS BEC repository
Clone the current cSAXS BEC repository from GIT into the new e-account. Create directory
mkdir ~/Data10/software
cd ~/Data10/software
Clone repository
git clone https://gitlab.psi.ch/bec/csaxs_bec.git
Start epics iocs
You can start up the iocs while the ./setup_bec.sh script is running. Be aware though that the scripts requires you to interact with it.
DelayGenerator
Open a new tab in a terminal in comp1/comp2 or cons1 and follow the commands below:
ssh gac-x12sa@localhost
cd ~/delaygen
iocsh -7.0.6 startup.script
Be aware -7.0.6 is referring to the current epics version and might change in future (SLS 2.0). To start the epics panel (only if needed), run in a new shell
caqtdm -noMsg -macro P=delaygen:,R=DG1: srsDG645.ui
More notes on usages and cabelling of DDGs. Currently 3 generators are used:
- DDG1 for detectors (EXT Enable from SGalil stages, T0 to DDG2, AB for eiger, CD for Falcon, EF for Pilatus_2)
- DDG2 for mcs card (ext. enable from DDG1, AB to mcs card)
- DDG3 for fast shutter and mcs enable (AB short pulse to enable MCS (needed!!), CD to keep FSH open )
Eiger
Open a new tab in a terminal in comp1/comp2 or cons1 and follow the commands below:
ssh gac-x12sa@localhost
cd ~/Software/Eiger/
./launch_ioc
A live view of status and images for std_daq can be found here xbl-daq-29:5000.
Pilatus_2
First, start the cam server. Connect to the computer and follow the instructions printed after connecting:
ssh det@x12sa-pd-2 (Pilatus2)
The cam server will open, wait until you see **. Nex step, open a new tab in a terminal in comp1/comp2 or cons1 and follow the commands below:
ssh gac-x12sa@localhost
cd ~/Software/Pilatus300K/
./launch_epics
FalconX1
Open a new tab in a terminal in comp1/comp2 or cons1 (logged in as the current e-account) and follow the commands:
ssh x12sa-cons-01
cd /ioc/X12SA-PC-FALCONX1/
iocsh -7.0.6 startup.script
Be aware -7.0.6 is referring to the current epics version and might change in future (SLS 2.0)
Start BEC, BEC server and load device config
Step 1 needs to have finished for continuing with these steps. What remains now is to start the bec server. Connect to pc15543 and open a new terminal to run:
cd ~/Data10/software
source bec_venv/bin/activate
bec-server start
tmux attach -t bec
Open another teminal on pc15543 and start BEC:
cd ~/Data10/software
source bec_venv/bin/activate
bec
Note: In case there is a warning after starting BEC that it was not able to import scilog, you will have to pip install scilog in the bec_venv to be able to send printouts to scilog from the command line. Within a new terminal:
cd ~/Data10/software
source bec_venv/bin/activate
pip install scilog
Device config from csaxs-bec plugins
bec.config.update_session_with_file('/sls/X12SA/data/e20639/Data10/software/csaxs-bec/bec_plugins/configs/bec_device_config_sastt.yaml')
bec.config.save_current_session('~/Data10/software/current_config.yaml')
The second command is helpful if you adjust limits of motors, which will then be stored in the config and loaded if a reload of the configuration is needed.
BEC commands
A number of commands that are useful:
To move devices that are added in the config:
umv(dev.samx, 0) #absolute
umvr(dev.samx, 0) #relative
dev.samx.wm #print motor position and limits
dev.samx.limits = [low_limit, high_limit] # To set limits, note, same lower and higher limit, e.g. [0, 0] means no limits!!
Scans:
scans.acquire(exp_time = 0.5, frames_per_trigger=10, readout_time=3e-3) # equivalent to a loopscan 30 0.5
scans.line_scan(dev.samx, -1, 1, steps=20, exp_time=0.5, readout_time=3e-3, relative=True) # optional, add frames_per_trigger =10 for burst acquisition at each step
#Scan 2 motors in a step scan at the same time
scans.line_scan(dev.samx, -1, 1, dev.samy, -1, 1, steps=20, exp_time=0.5, readout_time =3e-3, relative=True) # step scan with 20 steps, again frames_per_trigger can be added for burst at each point
scans.sgalil_grid(start_y = , end_y = , interval_y = , start_x=, end_x=, interval_x =, exp_time=0.5, readout_time=3e-3, relative=True)