Commit Graph

Select branches

Hide Pull Requests

dev

master

pre-dev-merge-2026-10-16

Mono Color

• a2873056c3 editable DAQ fields on the main page, kept in sync with the preferences master dev John Henry BealeandClaude Opus 5.5 2026-10-16 14:10:59 +02:00
• bf411bb1a6 remove the 'TODO: cleanup PV names' startup warnings John Henry BealeandClaude Opus 5.5 2026-10-16 13:19:39 +02:00
• 5a584fb7de keep edited BS/PV channel lists across restarts John Henry BealeandClaude Opus 5.5 2026-10-16 13:19:38 +02:00
• c260c60888 edit the BS and PV channel lists in a separate dialog John Henry BealeandClaude Opus 5.5 2026-10-16 13:11:57 +02:00
• f811cf286e store absolute post sample tube out positions John Henry BealeandClaude Opus 5.5 2026-10-16 13:05:51 +02:00
• 5358424aa4 show beam position, energy and unit cell with full precision in preferences John Henry BealeandClaude Opus 5.5 2026-10-16 12:57:13 +02:00
• 017195e575 fix fast stage homing PV, add coarse Y homing to the Advanced menu John Henry BealeandClaude Opus 5.5 2026-10-16 12:52:09 +02:00
• e64f57bc31 remove unused GUI tabs and the x-ray eye group John Henry BealeandClaude Opus 5.5 2026-10-16 12:47:09 +02:00
• 2d9bbdac9d replace runtime print statements with logging John Henry BealeandClaude Opus 5.5 2026-10-16 11:56:49 +02:00
• efe18d4204 start paired post-tube axes together, fix GUI unlock after motor sequences John Henry BealeandClaude Opus 5.5 2026-10-16 11:14:49 +02:00
• d547f4f8f6 confirm before collecting when devices are not in data collection position John Henry BealeandClaude Opus 5.5 2026-10-16 09:44:46 +02:00
• e05ebeb76b run blocking motor sequences in the worker thread, wait for the backlight John Henry BealeandClaude Opus 5.5 2026-10-16 09:20:51 +02:00
• eab83c0fae fix mixed sim modes, camera parameter parsing and silent Collect John Henry BealeandClaude Opus 5.5 2026-10-16 08:34:13 +02:00
• 14b3300ec6 stop the CTA and cancel JFJ on abort, keep data up to the abort John Henry BealeandClaude Opus 5.5 2026-10-16 08:27:13 +02:00
• 64f2a4da72 recover the Deltatau after an aborted or failed data collection John Henry BealeandClaude Opus 5.5 2026-10-16 07:48:11 +02:00
• 976776d267 allow collimator/post-tube nudges during data collection, lock everything else John Henry BealeandClaude Opus 5.5 2026-10-15 14:22:43 +02:00
• ec1c7c659a fix simulated illumination and camera so --sim 0x1ff starts again John Henry BealeandClaude Opus 5.5 2026-10-15 12:43:21 +02:00
• c2c3ef82fd run data collection in a worker thread with a direct abort path John Henry BealeandClaude Opus 5.5 2026-10-15 12:39:44 +02:00
• 02d6ebf74d cleaned yp mode:7 cta seq. Now runs on large chip pre-dev-merge-2026-10-16 John Henry Beale 2026-08-25 12:50:52 +02:00
• 04fc647c65 updated mode:7 cta sequence John Henry Beale 2026-08-25 11:37:08 +02:00
• 7ef02b99c0 changed names of Data Storage labels to say, Last Run and Last Path John Henry Beale 2026-08-24 13:26:12 +02:00
• b785ea43c0 added move to home button John Henry Beale 2026-08-24 13:21:39 +02:00
• bc4e2b6001 corrected epics limits to be correctly passed to gui John Henry Beale 2026-08-24 13:17:31 +02:00
• 8dfd022d73 only alpha numerical characters to protein and prefix fields - removes wrong data path bug John Henry Beale 2026-08-24 12:26:26 +02:00
• 678b5990ea added new field to Data Storage - Data path of last run John Henry Beale 2026-08-24 12:22:56 +02:00
• 5b4f7f3f2a made data storage fields active and display real values John Henry Beale 2026-08-24 12:13:13 +02:00
• ed41dcf49e added YAG button to gui and YAG reference positions to preferences John Henry Beale 2026-08-24 11:50:33 +02:00
• 644c23ac50 added new detector postion 'safe' so the detector tube clear position can be set and watched for. This is done with a new function John Henry Beale 2026-08-24 11:18:09 +02:00
• 64d9ccacc7 add coarse-y to preferences John Henry Beale 2026-08-24 11:05:09 +02:00
• ff646a9ef5 changed the sleep time after shutter opening back to 1.1s John Henry Beale 2026-07-01 09:36:49 +02:00
• 1fea2ae4be fixed data collection progress bar John Henry Beale 2026-06-15 14:45:24 +02:00
• 9ee99a12ea trying to prevent EPICS callback threads updating QT widgets directly. John Henry Beale 2026-06-15 09:02:49 +02:00
• bfcaf5e7a9 attempting to increase gui stability by changing callbacks on threads John Henry Beale 2026-06-15 08:52:17 +02:00
• fbe9611dfd update mode 6 start logic. Now allows x sizes of greater 2, but must be positive and even. John Henry Beale 2026-06-15 08:23:38 +02:00
• 1552e86034 more updates to enable correct BS syncing John Henry Beale 2026-06-12 09:47:12 +02:00
• 9009258667 new logic for entry into modes 6 and 7. x and y limits of the modes John Henry Beale 2026-06-12 08:40:06 +02:00
• e5f96e8cb4 new BS logic for modes 6 and 7 John Henry Beale 2026-06-12 08:39:33 +02:00
• 1170855557 proposed change to mode 6 and 7 so that BS data stays in-sync John Henry Beale 2026-06-12 08:15:43 +02:00
• 1a22e8300a saving to file bug fixed John Henry Beale 2026-06-12 07:50:51 +02:00
• 1406dd6f9b fixed BS data via slic for modes 4 and 5 John Henry Beale 2026-06-11 15:55:47 +02:00
• 006b337d8c fixed OSError unsupported dile type bug when saving chip as .json John Henry Beale 2026-06-11 15:14:24 +02:00
• c3a92ff242 unsure of changes - sort after beamtime John Henry Beale 2026-05-21 07:40:29 +02:00
• 4af6b49190 lots of changes - many quick fixes made suring beamtime. many things to sort after the beamtime John Henry Beale 2026-05-21 07:39:33 +02:00
• f95fe49647 first functioning mode 7 for full column blocks John Henry Beale 2026-05-18 10:38:08 +02:00
• fc5799b8ef added detector and backlight safety to the move postube position in button John Henry Beale 2026-05-15 15:19:21 +02:00
• 6dae79b8a0 added additional safety to the Move backlight button so that the detector always moves to the out position 1st before the post-tube moves John Henry Beale 2026-05-15 15:07:28 +02:00
• 96c5163b27 added a new fixed-target (160,156) to drop down menu - meant specifically for stop-go and return John Henry Beale 2026-05-15 14:38:34 +02:00
• 960b48f0a4 attempt to fix intermitant startup bug - where the gui crashes as it fails to connect to the lights John Henry Beale 2026-05-15 14:10:58 +02:00
• 0aa124b912 fixed save data file overwrite bug John Henry Beale 2026-05-15 13:42:29 +02:00
• fef8250581 commented out iterencode function within MyJsonEncoder as it reformated the json as a single line and made it hard to read John Henry Beale 2026-05-15 13:38:11 +02:00
• 62575f2735 Merge branch 'master' of gitea.psi.ch:sf-mx/SwissMX John Henry Beale 2026-05-15 10:03:49 +02:00
• 790eae5c3b np 1.25 depreciation warning occurred during fit-grid to fiducials. Implimented fix for error message John Henry Beale 2026-05-15 09:54:29 +02:00
• 123f184074 fixing escape sequences, adding readme for mode 7 zamofing_t 2026-05-13 16:39:06 +02:00
• 810e96fe6b fixed dict(map..) bug - .conf can now be updated John Henry Beale 2026-05-13 13:32:28 +02:00
• 637a37b6dd updated np.mat to np.asmatrix John Henry Beale 2025-12-11 14:56:21 +01:00
• c4c5ea6491 running changes made by M.Appleby and J.Beale. Mainly to update due to python 3.10 John Henry Beale 2025-11-10 10:47:31 +01:00
• 84d74d5d23 SFELPHOTON-1418: minor fixes zamofing_t 2024-12-18 08:12:47 +01:00
• 4171ffda4e Merge branch 'master' of git.psi.ch:grp-sf_cristallina/SwissMX zamofing_t 2024-12-11 15:28:02 +01:00
• 0fe59e9ad6 try to cleanup stuff(3) zamofing_t 2024-12-11 15:26:01 +01:00
• df88bec23c update illumination-IP, change sleep-time for CTA Appleby Martin Vears 2024-12-11 15:23:23 +01:00
• 71a473d25d try to cleanup stuff(2) zamofing_t 2024-11-27 11:56:16 +01:00
• cc7d7c8e79 try to cleanup stuff(2) zamofing_t 2024-11-27 11:30:06 +01:00
• 24b7f1292d try to cleanup stuff zamofing_t 2024-11-27 09:25:51 +01:00
• b029cd62be SFELPHOTON-1409: hit-and-return, yaml as param zamofing_t 2024-11-27 07:55:57 +01:00
• 5d4808e6a1 Changes to psi_device and app_config to add gui options for JFJoch. PSI-device now parses these messages in a message to JFJoch Appleby Martin Vears 2024-11-25 11:10:19 +01:00
• a548b005f7 documentation cleanup, use mermaid zamofing_t 2024-10-31 15:56:41 +01:00
• 7014351eb4 SFELPHOTON-1335:try to debug zamofing_t 2024-10-24 12:11:50 +02:00
• 3fc4f50c15 optimize imports and cleanup code zamofing_t 2024-09-25 12:36:48 +02:00
• 457ea0e675 abs-path instead relative, cleanup code zamofing_t 2024-09-25 07:20:57 +02:00
• 3a0367073e SFELPHOTON-1337: SwissMX split/ cleanup/move repositories zamofing_t 2024-09-24 18:56:27 +02:00
• e63c814662 SFELPHOTON-1128: debug stup-and-go motion zamofing_t 2024-05-23 16:33:43 +02:00
• 153333f336 changes by the martin and John zamofing_t 2024-05-15 15:22:01 +02:00
• 5e954dec77 towards cta part 2 zamofing_t 2024-01-23 13:11:23 +01:00
• c270467e44 towards cta zamofing_t 2024-01-22 16:01:55 +01:00
• d1c3c08642 fixing coordTrf stuff, enhance logginh zamofing_t 2024-01-19 11:41:27 +01:00
• 21811abd92 fixing coordTrf stuff and screen updating zamofing_t 2024-01-18 16:23:26 +01:00
• 681d42dc2e SFELPHOTON-927: Beamtime Feb24 zamofing_t 2024-01-10 16:19:30 +01:00
• e41a3ed7ed fixing coordinate transformation zamofing_t 2023-12-12 14:17:07 +01:00
• 9e63ff0718 minor fixes zamofing_t 2023-12-05 12:07:54 +01:00
• fd3d36396d changes of John and Martin zamofing_t 2023-11-28 12:01:11 +01:00
• d7556bc8c0 changes for 2023 Dec. beamtime zamofing_t 2023-11-28 11:53:08 +01:00
• 62144be2eb switch to motorRecord Smaract zamofing_t 2023-07-19 13:57:45 +02:00
• 27279a31c9 further debugging, move old code to obsolete.py zamofing_t 2023-07-03 08:16:49 +02:00
• 05edca9d88 turn of monitors during data collection zamofing_t 2023-06-30 16:37:58 +02:00
• e910083b1a put try/catch for all monitor callbacks (suggestion Xiaoqiang) zamofing_t 2023-06-30 14:32:48 +02:00
• 0a965f66ce replace np.float with np.float64 zamofing_t 2023-06-29 10:37:16 +02:00
• 681b8f2953 enhance simulation zamofing_t 2023-06-29 10:02:42 +02:00
• bd7d71b0b0 other debug version zamofing_t 2023-06-29 08:49:37 +02:00
• 3a8ac885f5 beamtime fixes zamofing_t 2023-06-28 20:09:27 +02:00
• 6b86a1c319 minor fixes zamofing_t 2023-06-23 14:57:32 +02:00
• 0b63ebaa14 add missing files, fix coordinate transformation zamofing_t 2023-06-23 12:12:02 +02:00
• fa85ef7011 wip zamofing_t 2023-06-21 16:57:07 +02:00
• 79c4696ae5 wip zamofing_t 2023-06-20 17:36:01 +02:00
• 574605f583 wip zamofing_t 2023-06-20 16:10:03 +02:00
• 7659226aa2 path and codegen zamofing_t 2023-06-20 13:23:15 +02:00
• 523a154cd7 major fixes zamofing_t 2023-05-24 17:37:51 +02:00
• 6712251b9d change defaults and limits zamofing_t 2023-05-24 12:02:27 +02:00
• c1a674c91b add gonio default positions zamofing_t 2023-05-24 11:53:41 +02:00
• 89c836e29d cleanup zamofing_t 2023-05-10 15:02:05 +02:00
• 816d06f7c4 change requests: SFELPHOTON-640 zamofing_t 2022-11-23 13:19:53 +01:00