Commit Graph
1897 Commits
Author SHA1 Message Date
appleb_m 0256eb502b comments regarding front and back light 2026-06-24 15:29:56 +02:00
appleb_m d1f6df5223 anneal functionality added, including wait time, SHould be tested/optimised later. 2026-06-24 15:29:55 +02:00
appleb_m 87fefa534b exp_hutch_shutter added back in (import) 2026-06-24 15:29:55 +02:00
appleb_m 1d33687701 exp_hutch_shutter added back in 2026-06-24 15:29:55 +02:00
appleb_m 7714ac4c92 added option to save dtz safe position in redis but currently unused, added detector limit modifier so we do not hit soft limits by mistak in yaml file. Moved Detector_Z low and high limit check to the device and out of workflows. 2026-06-24 15:29:55 +02:00
appleb_m 3ff83ddd3c bec_worker: removed superfluous devices and added frontlight brightness 2026-06-24 15:29:55 +02:00
appleb_m 32818b4837 auth: corrected supre_user accounts list 2026-06-24 15:29:54 +02:00
appleb_m 269174574c removed unused devices, assocaited tests and old sam cam test file 2026-06-24 15:29:54 +02:00
appleb_m 9319f735c2 removed with_retry 2026-06-24 15:29:54 +02:00
appleb_m 4e45c08373 Kerberos running 2026-06-24 15:29:54 +02:00
appleb_m 0b530d1f08 tokens WIP 2026-06-24 15:29:54 +02:00
duan_j 928717625c remove Apache access log-based authentication and simplify Kerberos proxy handling 2026-06-24 15:29:54 +02:00
appleb_mandClaude Opus 4.8 b6e1edea3d tell_client: restore "No Pin in Gripper" detection on empty-gripper mount
Commit 071b4ab made mount() return SUCCESS as soon as it saw the intermediate
TELL "state"/Busy event, before the later "Gripper detection" event is read,
so an empty-gripper mount completed silently with no MountingFailed/pop-up.

check_command_ok blocks (wait_not_busy) until the mount sequence finishes, so
after it returns the robot's own record is authoritative: if get_mounted_sample()
is None the gripper was empty -> return NO_PIN_IN_GRIPPER, which the mounting
service maps to MountingFailed("No Pin in Gripper"). Covers manual and automation.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-24 14:36:27 +02:00
appleb_mandClaude Opus 4.8 7cedc84e38 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 13:02:21 +02:00
appleb_m 9850daed71 DAQ: added bbackup default_detector dsitances 2026-06-24 10:14:26 +02:00
appleb_m c3dd2aa38a BEC: changed the initialisation function in bec_worker.py and how certain PVS are handled: including ring_current backlight_brightness frontlight_brightness and zoom 2026-06-24 10:01:42 +02:00
appleb_mandClaude Opus 4.8 0fcfacd165 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-23 14:13:30 +02:00
appleb_m f2895fb375 daq: fixed dtecetor min and max bug if llm or hlm si missing in epics 2026-06-23 12:44:30 +02:00
appleb_m 071b4ab77f Tell_client: fix state event handling, update tests 2026-06-23 12:42:04 +02:00
appleb_m 6d42b1de5a raster_grid_manager.py: fixed lag with large grid, now generates a single bitmap 2026-06-23 09:50:37 +02:00
appleb_m cec4d12e3b tell: added door and remote check. 2026-06-23 09:50:04 +02:00
appleb_m d09425afab reminder to add tests for tell status chcks and other functions 2026-06-22 10:47:54 +02:00
appleb_m 0947dfa73b update test cases for workflows, server and daq_server 2026-06-22 10:46:34 +02:00
appleb_m 610aa4a998 workflows: when going to dewar transfer if tell is in pPark and get_moutn_sample is Noone don't dry. Untested! 2026-06-22 10:46:08 +02:00
appleb_m b6cbb5ce26 portrait_mode: added a loop button to rerun the queue for debugging 2026-06-22 10:45:24 +02:00
appleb_m 316f4d18c1 server: added mount checks to mount and autoamtion 2026-06-22 10:44:56 +02:00
appleb_m b6ab4d1e5e tell_client.py: added validate_mount_start_conditions method 2026-06-22 10:44:13 +02:00
appleb_m a5718f3f84 daq: automation log message split between success and error 2026-06-22 10:40:23 +02:00
appleb_m 924fabb7d9 bec_motors differ in some cases between beamline,s only a problem for logging/scilog messages 2026-06-22 10:39:55 +02:00
appleb_m 157619de64 Added style sheet options - protrait style needs to be added to more places. 2026-06-18 14:26:12 +02:00
appleb_m 08d6cbc699 config, added lens_magnfiication to alter pixel_to_mm calculation 2026-06-18 14:06:14 +02:00
appleb_m e66d8aec72 added portrait_mode.py 2026-06-18 14:05:54 +02:00
appleb_m 087ce0482f operations refactor: standardised operations, added rotation operation, updated tests. 2026-06-17 16:25:02 +02:00
appleb_m 9be8c1a3c8 beamlin: renamed second BeamlineConfig to BeamlineYAMLCOnfig 2026-06-17 16:24:27 +02:00
appleb_m 4ff30920ce devices: fix on bec det_z device 2026-06-17 11:41:04 +02:00
appleb_m 5f5c672111 pyproject.toml: should be sseclient not sseclient-py 2026-06-17 11:40:49 +02:00
appleb_m 5bc3e90bb4 tell: debuging. 2026-06-17 11:40:34 +02:00
appleb_m dde084538c updated workflows test 2026-06-17 11:40:20 +02:00
appleb_m 333957adbc better erro hadnling for status bar 2026-06-17 11:40:11 +02:00
appleb_m 37d3e55da3 workflows.py: added safe dtz positon check 2026-06-17 11:39:57 +02:00
appleb_m 271e3e6ce3 yaml updates 2026-06-17 11:38:25 +02:00
appleb_m d242473cd6 detector_metadata: endpoint in sevrer was incorrect. 2026-06-16 14:16:05 +02:00
appleb_m f7e5900dc5 aarelc_infer.py and yaml updated url for 6D 2026-06-16 14:15:40 +02:00
appleb_m 76d58cb090 added smargon_frontend_url to yaml files 2026-06-16 12:13:54 +02:00
appleb_m cbd0c635c7 Change how detector metadate is stored - now in redis - so status updates are faster. 2026-06-16 12:13:41 +02:00
appleb_m 7eb977d51a tell:debugging, trying to catch and interpret roboto returns busy during wait for events correctly 2026-06-16 12:12:30 +02:00
appleb_m b8ee526d04 raster: logging to track com 2026-06-16 12:11:59 +02:00
appleb_m e00e7701f3 config: remove ABR_POS_ALIGN_DEF and use ABR_POS_MOUNT instead 2026-06-16 12:09:51 +02:00
appleb_m 67ea402dd4 Defining a bec device pv as a variable that can be called is significantly faster than calling motor.postion or motor.low_limit everytime. (~6 us compared to 200 ms) 2026-06-16 12:09:00 +02:00
appleb_m ade2c6df63 raster: added back COM calculation, needs testing 2026-06-15 16:59:14 +02:00