Commit Graph
222 Commits
Author SHA1 Message Date
perl_d 72d96ecd6a style: formatter again
CI / lint (pull_request) Successful in 1m34s
CI / lint (push) Successful in 2m26s
CI / test (3.11) (pull_request) Successful in 1m49s
CI / test (3.12) (pull_request) Successful in 1m46s
CI / test (3.11) (push) Successful in 1m28s
CI / test (3.12) (push) Successful in 4m54s
2026-07-27 15:00:26 +02:00
perl_d 2c237b6623 style: fix a few style issues by hand
CI / lint (push) Failing after 56s
CI / test (3.11) (push) Skipped
CI / test (3.12) (push) Skipped
CI / lint (pull_request) Failing after 2m11s
CI / test (3.11) (pull_request) Skipped
CI / test (3.12) (pull_request) Skipped
2026-07-27 14:57:29 +02:00
perl_d 6affbf9148 style: ruff check --fix --unsafe-fixes 2026-07-27 14:46:06 +02:00
perl_d 910076a238 style: ruff check --fix 2026-07-27 14:45:37 +02:00
perl_d 0451b8cebb style: ruff format 2026-07-27 14:45:12 +02:00
David Perl df3ddc5c84 Live changes from early July, PX-III
Build and Publish / test (pull_request_target) Successful in 2m59s
Build and Publish / build (pull_request_target) Successful in 19s
Build and Publish / Build and Deploy Docs (pull_request_target) Successful in 35s
2026-07-27 10:33:04 +02:00
appleb_m 99ec01c34c feat: updated the idle close timeout to 8 hours
Build and Publish / test (push) Successful in 2m24s
Build and Publish / build (push) Successful in 17s
Build and Publish / Build and Deploy Docs (push) Failing after 11m46s
2026-07-14 10:05:59 +02:00
appleb_m e6b759e6e2 feat: updated the idle close timeout to 8 hours
Build and Publish / test (push) Successful in 3m6s
Build and Publish / build (push) Successful in 19s
Build and Publish / Build and Deploy Docs (push) Successful in 40s
2026-07-14 09:51:43 +02:00
appleb_m 89564a55e1 fix: user values now should persist between samples, only reset to default on start up.
Build and Publish / test (pull_request) Successful in 2m42s
Build and Publish / test (pull_request_target) Successful in 2m24s
Build and Publish / test (push) Successful in 2m24s
Build and Publish / build (pull_request) Successful in 18s
Build and Publish / build (pull_request_target) Successful in 20s
Build and Publish / build (push) Successful in 20s
Build and Publish / Build and Deploy Docs (pull_request) Successful in 40s
Build and Publish / Build and Deploy Docs (pull_request_target) Failing after 35s
Build and Publish / Build and Deploy Docs (push) Successful in 35s
2026-07-09 15:22:38 +02:00
perl_d 9fb2004e05 fix: detector url
Build and Publish / test (pull_request) Failing after 1m40s
Build and Publish / build (pull_request) Skipped
Build and Publish / Build and Deploy Docs (pull_request) Skipped
Build and Publish / test (pull_request_target) Failing after 1m40s
Build and Publish / test (push) Failing after 1m39s
Build and Publish / build (pull_request_target) Skipped
Build and Publish / Build and Deploy Docs (pull_request_target) Skipped
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-07-09 12:50:59 +02:00
perl_d 1f5af092ac tidy about functions 2026-07-09 12:50:38 +02:00
perl_d 52a9765182 feat: server about info 2026-07-09 10:09:39 +02:00
perl_d cebd4e82bc feat: display version, gui and env location in about
Build and Publish / test (pull_request) Successful in 2m16s
Build and Publish / build (pull_request) Successful in 17s
Build and Publish / test (pull_request_target) Successful in 2m24s
Build and Publish / test (push) Successful in 2m27s
Build and Publish / build (pull_request_target) Successful in 17s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (pull_request) Successful in 38s
Build and Publish / Build and Deploy Docs (pull_request_target) Successful in 41s
Build and Publish / Build and Deploy Docs (push) Failing after 38s
2026-07-07 17:03:09 +02:00
perl_d cf879ee2a5 feat: display version, gui and env location in about
Build and Publish / test (pull_request) Failing after 1m27s
Build and Publish / build (pull_request) Skipped
Build and Publish / Build and Deploy Docs (pull_request) Skipped
Build and Publish / test (pull_request_target) Failing after 1m23s
Build and Publish / build (pull_request_target) Skipped
Build and Publish / Build and Deploy Docs (pull_request_target) Skipped
Build and Publish / test (push) Failing after 1m32s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-07-07 17:02:07 +02:00
perl_d 3ec2bc011b feat: add hostname+user to gui logs
Build and Publish / test (pull_request) Successful in 2m16s
Build and Publish / test (pull_request_target) Successful in 2m7s
Build and Publish / build (pull_request) Successful in 19s
Build and Publish / test (push) Successful in 2m28s
Build and Publish / build (pull_request_target) Successful in 19s
Build and Publish / Build and Deploy Docs (pull_request) Successful in 38s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (pull_request_target) Successful in 33s
Build and Publish / Build and Deploy Docs (push) Successful in 33s
2026-07-06 16:27:08 +02:00
perl_d 99326614ae style: ruff check fix 2026-07-06 15:39:02 +02:00
perl_d b0863e5ddb style: format with ruff
Build and Publish / test (pull_request) Failing after 1m23s
Build and Publish / build (pull_request) Skipped
Build and Publish / Build and Deploy Docs (pull_request) Skipped
2026-07-06 11:53:49 +02:00
perl_d 13bddd43c7 refactor: use aarecommon and remove common 2026-07-06 11:53:49 +02:00
perl_d 8f0a85316d refactor: move qt logging to gui module 2026-07-06 11:53:49 +02:00
perl_d b0b655aea0 feat: live changes 26-07-06
Build and Publish / test (push) Successful in 2m32s
Build and Publish / build (push) Successful in 18s
Build and Publish / Build and Deploy Docs (push) Successful in 47s
2026-07-06 10:45:15 +02:00
appleb_m 18fe88469a bec/gui: added save_current_psotion and save_and_reload macros to GUI
Build and Publish / test (push) Failing after 2m13s
Build and Publish / build (push) Skipped
Build and Publish / Build and Deploy Docs (push) Skipped
2026-07-03 14:13:36 +02:00
appleb_m a6fc27dc9f rotation_scan_manager.py: fixed missing imports bug
Build and Publish / build (push) Skipped
Build and Publish / test (push) Failing after 2m15s
Build and Publish / Build and Deploy Docs (push) Skipped
2026-07-03 11:29:20 +02:00
appleb_m 6a90a01dbe local_contact_panel.py: added config for autoamtion, currently just the sleep between mount and wait. 2026-07-03 11:28:00 +02:00
appleb_m 99634f69c2 scan_completed is now beamline agnostic 2026-07-02 17:18:50 +02:00
appleb_m 22749f18d6 Enable screening mode for rotation scans and improve logging/debug messages in rotation and raster services.
Build and Publish / test (push) Successful in 2m9s
Build and Publish / build (push) Successful in 17s
Build and Publish / Build and Deploy Docs (push) Successful in 39s
2026-06-30 14:54:18 +02:00
appleb_m 64e054f9d8 Merge branch 'ml_zoom'
Build and Publish / test (push) Successful in 2m12s
Build and Publish / build (push) Failing after 17s
Build and Publish / Build and Deploy Docs (push) Skipped
# Conflicts:
#	src/aare/daq/operations/raster/service.py
2026-06-26 16:45:20 +02:00
appleb_m 929b9aee8d Raster_grid_manager: renabled load from file 2026-06-26 11:19:10 +02:00
appleb_m 6420709114 Smargon_panel: Russell added z-axis smargon buttons to the GUI, already tested! 2026-06-26 10:52:29 +02:00
appleb_m 88d17d6b33 status_bar: shutter renamed fast shutter 2026-06-26 10:50:56 +02:00
appleb_mandClaude Opus 4.8 48111e5718 gui: always allow pausing automation; only gate starting/resuming
The play/pause toggle ran its start-time checks (beamline state, busy, baton,
maintenance) before the pause branch, so when running you could be blocked from
pausing if the beamline was in the wrong state or busy.

Handle the pause toggle first and return immediately (unconditional), and run
the start-condition gates only when starting/resuming from paused.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-26 09:58:05 +02:00
duan_jandClaude Opus 4.8 f860e47914 DAQ/GUI: raster score as its own metric + score-based targeting
Build and Publish / test (pull_request) Successful in 2m7s
Build and Publish / build (pull_request) Successful in 17s
Build and Publish / Build and Deploy Docs (pull_request) Successful in 41s
Build and Publish / build (pull_request_target) Cancelled after 0s
Build and Publish / Build and Deploy Docs (pull_request_target) Cancelled after 0s
Build and Publish / test (pull_request_target) Cancelled after 16s
- promote crystal score to its own RasterGridMetric.RASTER_SCORE; first and
  default metric in the GUI dropdown; restore PR to original "Profile Radius"
- send per-cell raster score to AareDB via RasterPayloadModel
- split raster_highest_score (compute_crystal_score_array) from
  raster_centre_of_mass (restored to ndimage.center_of_mass); use score-based
  targeting for where-to-collect in both simulation and real mode
- add tests covering compute_crystal_score_array and raster_highest_score

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-25 18:05:29 +02:00
appleb_m f7b5008be5 workflows.py: up the exposure time on xtal snapshot to 1 ms. 2026-06-25 16:28:49 +02:00
appleb_m 4d075eb79a GUI: reactivated show coordinates
Build and Publish / test (push) Successful in 2m8s
Build and Publish / build (push) Successful in 17s
Build and Publish / Build and Deploy Docs (push) Successful in 40s
2026-06-25 11:07:56 +02:00
appleb_m 8c9f594d24 DAQ/GUI: updated beam location to use fixed exp and gain. This can be set now from teh GUi and stored in REDIS. 2026-06-25 09:58:47 +02:00
appleb_mandClaude Opus 4.8 a205d6422f gui: surface "beamline busy" errors quietly, not as a modal
BeamlineBusyException / TellCommandWhileBusyException fire when a user triggers
an action while the beamline or robot is busy. These are blocking-but-benign
("you can't do that right now"), so route them to the log + status bar instead
of a modal pop-up (and without the defensive automation pause), regardless of
the exception's critical flag. Genuine failures (e.g. No Pin in Gripper) still
get the modal.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-24 16:26:18 +02:00
appleb_mandClaude Opus 4.8 47e05dc28c GUI/DAQ: hutch-safety gating, error pop-ups, and automation pause-and-wait
Fix the GUI pop-up path and add personnel-safety-system (PSS) gating so
door-open / beam-down / shutter-closed conditions are surfaced and acted on.

- exception pop-ups: connect the previously-orphaned http_error signal;
  failed user operations now raise a modal dialog, background/polling errors
  a non-modal banner.
- PSS device (devices/pss_state.py) reading EH1-PSYS PROHIBITED-STATE /
  ALARM-STATE; new critical DoorSafetyError + DOOR_SAFETY_ERROR code.
- mounting service blocks mount/unmount when the hutch is not prohibited or
  an alarm is active; /status now publishes pss_prohibited / pss_alarm.
- GUI blocks manual mount/unmount and the automation Run button immediately
  (pop-up) on door-open, and shows a warning banner while an alarm is active.
- centralise per-action precondition checks (ring current, safety shutter,
  hutch door) into one combined "continue?" dialog with a session-global
  "don't ask again for 1 hour" snooze, applied to all data-collection buttons.
- live automation pauses and auto-resumes on bad conditions (beam, shutter,
  door, robot) with continue-now / stop overrides, gated by a default-on
  "Pause on bad conditions" checkbox replacing the dead CHECK_ENABLED constant.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-24 15:30:08 +02:00
appleb_mandClaude Opus 4.8 476aa69d70 data collection settings: panel-level Database/User-values toggle
Add DbOverrideLineEdit: a numeric field holding both a database value and
the user's value, driven by a per-tab Database/User-values toggle. The
user's value persists across samples, can be reverted to the database
value, and recovered again - replacing the clunky per-field checkboxes.

Fix the dtz<->resolution coupling so editing one updates the other in both
Database and User modes (previously it broke whenever a value was
overridden). Wire resolution, detector distance, transmission, exposure,
rotation total/image angle and the raster grid element size through the
new widget; other panels are untouched.

Add tests covering persist/revert/recover, the toggle's downstream emit,
the dtz/resolution coupling in both modes, and cross-sample persistence.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-06-24 15:30:08 +02:00
appleb_m d43218eb19 raster_grid_manager.py: fixed lag with large grid, now generates a single bitmap 2026-06-24 15:30:07 +02:00
appleb_m c6ac739548 portrait_mode: added a loop button to rerun the queue for debugging 2026-06-24 15:30:06 +02:00
appleb_m c1edacc9c3 Added style sheet options - protrait style needs to be added to more places. 2026-06-24 15:30:05 +02:00
appleb_m 7c8e3e78a8 added portrait_mode.py 2026-06-24 15:30:04 +02:00
appleb_m 90758fd246 better erro hadnling for status bar 2026-06-24 15:30:03 +02:00
appleb_m 36a06ccf14 Change how detector metadate is stored - now in redis - so status updates are faster. 2026-06-24 15:30:01 +02:00
appleb_m 4c30ce92f6 main_window: connect new beamline state buttons to daq worker 2026-06-24 15:30:00 +02:00
appleb_m cc14ebf0a0 busy overlay: user messages are now robot 2026-06-24 15:29:59 +02:00
appleb_m f444f6c2c8 Beamline state panel: exposed new beamline state changes to GUI 2026-06-24 15:29:59 +02:00
appleb_m 6996a91b59 mainwindow: tempoarily remove seconday beamline camera view 2026-06-24 15:29:58 +02:00
appleb_m 2f8670fb39 GUI: removed bad logging statment 2026-06-24 15:29:58 +02:00
appleb_m c09718a030 daq_worker: error logging added to status request 2026-06-24 15:29:58 +02:00
appleb_m e88e6e5608 auth: increased timeout in auth 2026-06-24 15:29:58 +02:00