sf-mx/SwissMX
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
139 Commits 1 Branch 0 Tags
master
Commit Graph

139 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
John Henry Beale c3a92ff242 unsure of changes - sort after beamtime 2026-05-21 07:40:29 +02:00
John Henry Beale 4af6b49190 lots of changes - many quick fixes made suring beamtime. many things to sort after the beamtime 2026-05-21 07:39:33 +02:00
John Henry Beale f95fe49647 first functioning mode 7 for full column blocks 2026-05-18 10:38:08 +02:00
John Henry Beale fc5799b8ef added detector and backlight safety to the move postube position in button 2026-05-15 15:19:21 +02:00
John Henry Beale 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 2026-05-15 15:07:28 +02:00
John Henry Beale 96c5163b27 added a new fixed-target (160,156) to drop down menu - meant specifically for stop-go and return 2026-05-15 14:38:34 +02:00
John Henry Beale 960b48f0a4 attempt to fix intermitant startup bug - where the gui crashes as it fails to connect to the lights 2026-05-15 14:10:58 +02:00
John Henry Beale 0aa124b912 fixed save data file overwrite bug 2026-05-15 13:42:29 +02:00
John Henry Beale fef8250581 commented out iterencode function within MyJsonEncoder as it reformated the json as a single line and made it hard to read 2026-05-15 13:38:11 +02:00
John Henry Beale 62575f2735 Merge branch 'master' of gitea.psi.ch:sf-mx/SwissMX 
didn't pull changes Thierry made to enable mode:7 in gui - before trying
to fix but in swissmx.py. Pulled Thierry's commits, then pushed my bug
fix.
 2026-05-15 10:03:49 +02:00
John Henry Beale 790eae5c3b np 1.25 depreciation warning occurred during fit-grid to fiducials. Implimented fix for error message 2026-05-15 09:54:29 +02:00
zamofing_t 123f184074 fixing escape sequences, adding readme for mode 7 2026-05-13 16:39:06 +02:00
John Henry Beale 810e96fe6b fixed dict(map..) bug - .conf can now be updated 2026-05-13 13:36:19 +02:00
John Henry Beale 637a37b6dd updated np.mat to np.asmatrix 2025-12-11 14:56:21 +01:00
John Henry Beale c4c5ea6491 running changes made by M.Appleby and J.Beale. Mainly to update due to python 3.10 2025-11-10 10:47:31 +01:00
zamofing_t 84d74d5d23 SFELPHOTON-1418: minor fixes 2024-12-18 08:13:08 +01:00
zamofing_t 4171ffda4e Merge branch 'master' of git.psi.ch:grp-sf_cristallina/SwissMX 2024-12-11 15:28:02 +01:00
zamofing_t 0fe59e9ad6 try to cleanup stuff(3) 2024-12-11 15:26:01 +01:00
Appleby Martin Vears df88bec23c update illumination-IP, change sleep-time for CTA 2024-12-11 15:23:23 +01:00
zamofing_t 71a473d25d try to cleanup stuff(2) 2024-11-27 11:56:16 +01:00
zamofing_t cc7d7c8e79 try to cleanup stuff(2) 2024-11-27 11:30:06 +01:00
zamofing_t 24b7f1292d try to cleanup stuff 2024-11-27 09:25:51 +01:00
zamofing_t b029cd62be SFELPHOTON-1409: hit-and-return, yaml as param 2024-11-27 07:55:57 +01:00
Appleby Martin Vears 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 2024-11-25 11:10:19 +01:00
zamofing_t a548b005f7 documentation cleanup, use mermaid 2024-10-31 15:56:41 +01:00
zamofing_t 7014351eb4 SFELPHOTON-1335:try to debug 2024-10-24 12:11:50 +02:00
zamofing_t 3fc4f50c15 optimize imports and cleanup code 2024-09-25 12:36:48 +02:00
zamofing_t 457ea0e675 abs-path instead relative, cleanup code 2024-09-25 07:20:57 +02:00
zamofing_t 3a0367073e SFELPHOTON-1337: SwissMX split/ cleanup/move repositories 2024-09-24 18:56:27 +02:00
zamofing_t e63c814662 SFELPHOTON-1128: debug stup-and-go motion 2024-05-23 16:33:43 +02:00
zamofing_t 153333f336 changes by the martin and John 2024-05-15 15:22:01 +02:00
zamofing_t 5e954dec77 towards cta part 2 2024-01-23 13:11:23 +01:00
zamofing_t c270467e44 towards cta 2024-01-22 16:01:55 +01:00
zamofing_t d1c3c08642 fixing coordTrf stuff, enhance logginh 2024-01-19 11:41:27 +01:00
zamofing_t 21811abd92 fixing coordTrf stuff and screen updating 
- fix sign error in transformation for z
- MotorTweak.py rel_move relative to RBV not VAL
- SimMotorTweak.py move emits also RBV to update objects in SwissMX
- update Readme.md
 2024-01-18 16:23:26 +01:00
zamofing_t 681d42dc2e SFELPHOTON-927: Beamtime Feb24 2024-01-10 16:19:30 +01:00
zamofing_t e41a3ed7ed fixing coordinate transformation 2023-12-12 17:06:25 +01:00
zamofing_t 9e63ff0718 minor fixes 2023-12-05 12:07:54 +01:00
zamofing_t fd3d36396d changes of John and Martin 2023-11-28 12:01:11 +01:00
zamofing_t d7556bc8c0 changes for 2023 Dec. beamtime 2023-11-28 11:53:08 +01:00
zamofing_t 62144be2eb switch to motorRecord Smaract 2023-07-19 13:57:45 +02:00
zamofing_t 27279a31c9 further debugging, move old code to obsolete.py 2023-07-03 08:16:49 +02:00
zamofing_t 05edca9d88 turn of monitors during data collection 2023-06-30 16:37:58 +02:00
zamofing_t e910083b1a put try/catch for all monitor callbacks (suggestion Xiaoqiang) 2023-06-30 14:32:48 +02:00
zamofing_t 0a965f66ce replace np.float with np.float64 2023-06-29 10:37:16 +02:00
zamofing_t 681b8f2953 enhance simulation 2023-06-29 10:13:29 +02:00
zamofing_t bd7d71b0b0 other debug version 2023-06-29 08:49:37 +02:00
zamofing_t 3a8ac885f5 beamtime fixes 2023-06-28 20:09:27 +02:00
zamofing_t 6b86a1c319 minor fixes 2023-06-23 14:57:32 +02:00
zamofing_t 0b63ebaa14 add missing files, fix coordinate transformation 2023-06-23 12:12:02 +02:00