126 Commits

Author SHA1 Message Date
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
84d74d5d23 SFELPHOTON-1418: minor fixes 2024-12-18 08:13:08 +01:00
4171ffda4e Merge branch 'master' of git.psi.ch:grp-sf_cristallina/SwissMX 2024-12-11 15:28:02 +01:00
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
71a473d25d try to cleanup stuff(2) 2024-11-27 11:56:16 +01:00
cc7d7c8e79 try to cleanup stuff(2) 2024-11-27 11:30:06 +01:00
24b7f1292d try to cleanup stuff 2024-11-27 09:25:51 +01:00
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
a548b005f7 documentation cleanup, use mermaid 2024-10-31 15:56:41 +01:00
7014351eb4 SFELPHOTON-1335:try to debug 2024-10-24 12:11:50 +02:00
3fc4f50c15 optimize imports and cleanup code 2024-09-25 12:36:48 +02:00
457ea0e675 abs-path instead relative, cleanup code 2024-09-25 07:20:57 +02:00
3a0367073e SFELPHOTON-1337: SwissMX split/ cleanup/move repositories 2024-09-24 18:56:27 +02:00
e63c814662 SFELPHOTON-1128: debug stup-and-go motion 2024-05-23 16:33:43 +02:00
153333f336 changes by the martin and John 2024-05-15 15:22:01 +02:00
5e954dec77 towards cta part 2 2024-01-23 13:11:23 +01:00
c270467e44 towards cta 2024-01-22 16:01:55 +01:00
d1c3c08642 fixing coordTrf stuff, enhance logginh 2024-01-19 11:41:27 +01:00
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
681d42dc2e SFELPHOTON-927: Beamtime Feb24 2024-01-10 16:19:30 +01:00
e41a3ed7ed fixing coordinate transformation 2023-12-12 17:06:25 +01:00
9e63ff0718 minor fixes 2023-12-05 12:07:54 +01:00
fd3d36396d changes of John and Martin 2023-11-28 12:01:11 +01:00
d7556bc8c0 changes for 2023 Dec. beamtime 2023-11-28 11:53:08 +01:00
62144be2eb switch to motorRecord Smaract 2023-07-19 13:57:45 +02:00
27279a31c9 further debugging, move old code to obsolete.py 2023-07-03 08:16:49 +02:00
05edca9d88 turn of monitors during data collection 2023-06-30 16:37:58 +02:00
e910083b1a put try/catch for all monitor callbacks (suggestion Xiaoqiang) 2023-06-30 14:32:48 +02:00
0a965f66ce replace np.float with np.float64 2023-06-29 10:37:16 +02:00
681b8f2953 enhance simulation 2023-06-29 10:13:29 +02:00
bd7d71b0b0 other debug version 2023-06-29 08:49:37 +02:00
3a8ac885f5 beamtime fixes 2023-06-28 20:09:27 +02:00
6b86a1c319 minor fixes 2023-06-23 14:57:32 +02:00
0b63ebaa14 add missing files, fix coordinate transformation 2023-06-23 12:12:02 +02:00
fa85ef7011 wip 2023-06-21 16:57:07 +02:00
79c4696ae5 wip 2023-06-20 17:36:01 +02:00
574605f583 wip 2023-06-20 16:10:03 +02:00
7659226aa2 path and codegen 2023-06-20 13:23:15 +02:00
523a154cd7 major fixes 2023-05-24 17:37:51 +02:00
6712251b9d change defaults and limits 2023-05-24 12:02:27 +02:00
c1a674c91b add gonio default positions 2023-05-24 11:53:41 +02:00
89c836e29d cleanup 2023-05-10 15:02:05 +02:00
816d06f7c4 change requests: SFELPHOTON-640 2022-11-23 13:19:53 +01:00
c75c2c1d33 use new ESB_MX module and better triggerSync 2022-10-04 17:27:13 +02:00
7a67889992 fix in synchronization, add padding frames for JF 2022-09-28 16:56:32 +02:00
a186d256d3 various fixes (post_sample_tube, timing etc.) 2022-09-28 14:52:13 +02:00
30a9c77230 add DAQ params, better autofocus 2022-09-27 11:11:38 +02:00