Commit Graph

Select branches

Hide Pull Requests

master

Mono Color

• 637a37b6dd updated np.mat to np.asmatrix master 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 Thierry Zamofing 2024-12-18 08:12:47 +01:00
• 4171ffda4e Merge branch 'master' of git.psi.ch:grp-sf_cristallina/SwissMX Thierry Zamofing 2024-12-11 15:28:02 +01:00
• 0fe59e9ad6 try to cleanup stuff(3) Thierry Zamofing 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) Thierry Zamofing 2024-11-27 11:56:16 +01:00
• cc7d7c8e79 try to cleanup stuff(2) Thierry Zamofing 2024-11-27 11:30:06 +01:00
• 24b7f1292d try to cleanup stuff Thierry Zamofing 2024-11-27 09:25:51 +01:00
• b029cd62be SFELPHOTON-1409: hit-and-return, yaml as param Thierry Zamofing 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 Thierry Zamofing 2024-10-31 15:56:41 +01:00
• 7014351eb4 SFELPHOTON-1335:try to debug Thierry Zamofing 2024-10-24 12:11:50 +02:00
• 3fc4f50c15 optimize imports and cleanup code Thierry Zamofing 2024-09-25 12:36:48 +02:00
• 457ea0e675 abs-path instead relative, cleanup code Thierry Zamofing 2024-09-25 07:20:57 +02:00
• 3a0367073e SFELPHOTON-1337: SwissMX split/ cleanup/move repositories Thierry Zamofing 2024-09-24 18:56:27 +02:00
• e63c814662 SFELPHOTON-1128: debug stup-and-go motion Thierry Zamofing 2024-05-23 16:33:43 +02:00
• 153333f336 changes by the martin and John Thierry Zamofing 2024-05-15 15:22:01 +02:00
• 5e954dec77 towards cta part 2 Thierry Zamofing 2024-01-23 13:11:23 +01:00
• c270467e44 towards cta Thierry Zamofing 2024-01-22 16:01:55 +01:00
• d1c3c08642 fixing coordTrf stuff, enhance logginh Thierry Zamofing 2024-01-19 11:41:27 +01:00
• 21811abd92 fixing coordTrf stuff and screen updating Thierry Zamofing 2024-01-18 16:23:26 +01:00
• 681d42dc2e SFELPHOTON-927: Beamtime Feb24 Thierry Zamofing 2024-01-10 16:19:30 +01:00
• e41a3ed7ed fixing coordinate transformation Thierry Zamofing 2023-12-12 14:17:07 +01:00
• 9e63ff0718 minor fixes Thierry Zamofing 2023-12-05 12:07:54 +01:00
• fd3d36396d changes of John and Martin Thierry Zamofing 2023-11-28 12:01:11 +01:00
• d7556bc8c0 changes for 2023 Dec. beamtime Thierry Zamofing 2023-11-28 11:53:08 +01:00
• 62144be2eb switch to motorRecord Smaract Thierry Zamofing 2023-07-19 13:57:45 +02:00
• 27279a31c9 further debugging, move old code to obsolete.py Thierry Zamofing 2023-07-03 08:16:49 +02:00
• 05edca9d88 turn of monitors during data collection Thierry Zamofing 2023-06-30 16:37:58 +02:00
• e910083b1a put try/catch for all monitor callbacks (suggestion Xiaoqiang) Thierry Zamofing 2023-06-30 14:32:48 +02:00
• 0a965f66ce replace np.float with np.float64 Thierry Zamofing 2023-06-29 10:37:16 +02:00
• 681b8f2953 enhance simulation Thierry Zamofing 2023-06-29 10:02:42 +02:00
• bd7d71b0b0 other debug version Thierry Zamofing 2023-06-29 08:49:37 +02:00
• 3a8ac885f5 beamtime fixes Thierry Zamofing 2023-06-28 20:09:27 +02:00
• 6b86a1c319 minor fixes Thierry Zamofing 2023-06-23 14:57:32 +02:00
• 0b63ebaa14 add missing files, fix coordinate transformation Thierry Zamofing 2023-06-23 12:12:02 +02:00
• fa85ef7011 wip Thierry Zamofing 2023-06-21 16:57:07 +02:00
• 79c4696ae5 wip Thierry Zamofing 2023-06-20 17:36:01 +02:00
• 574605f583 wip Thierry Zamofing 2023-06-20 16:10:03 +02:00
• 7659226aa2 path and codegen Thierry Zamofing 2023-06-20 13:23:15 +02:00
• 523a154cd7 major fixes Thierry Zamofing 2023-05-24 17:37:51 +02:00
• 6712251b9d change defaults and limits Thierry Zamofing 2023-05-24 12:02:27 +02:00
• c1a674c91b add gonio default positions Thierry Zamofing 2023-05-24 11:53:41 +02:00
• 89c836e29d cleanup Thierry Zamofing 2023-05-10 15:02:05 +02:00
• 816d06f7c4 change requests: SFELPHOTON-640 Thierry Zamofing 2022-11-23 13:19:53 +01:00
• c75c2c1d33 use new ESB_MX module and better triggerSync Thierry Zamofing 2022-10-04 17:27:13 +02:00
• 7a67889992 fix in synchronization, add padding frames for JF Thierry Zamofing 2022-09-28 16:56:32 +02:00
• a186d256d3 various fixes (post_sample_tube, timing etc.) Thierry Zamofing 2022-09-28 14:52:13 +02:00
• 30a9c77230 add DAQ params, better autofocus Thierry Zamofing 2022-09-27 11:11:38 +02:00
• d8399e901c copy current SwissMX.conf, minor fixes Thierry Zamofing 2022-09-21 16:11:03 +02:00
• 1393269ceb add app_utils for motion_assert, contextMenu og GraphItem, further fixes Thierry Zamofing 2022-09-21 11:06:10 +02:00
• 158150a954 work on config, fiducial, autofocus Thierry Zamofing 2022-09-20 12:33:41 +02:00
• c3542ad38c better but not yet perfect autofocus Thierry Zamofing 2022-09-19 17:20:00 +02:00
• 21afed9739 fix tracking object bugs after collection Thierry Zamofing 2022-09-19 09:22:28 +02:00
• a1ceef7de9 sign changes for collect Thierry Zamofing 2022-09-16 18:36:05 +02:00
• 33ce6c99f3 various stuff Thierry Zamofing 2022-09-16 17:04:04 +02:00
• ba4f5feecb various fixes Thierry Zamofing 2022-09-16 12:25:36 +02:00
• 6a7b5ab91e very promissing fiducial detection Thierry Zamofing 2022-09-15 19:19:13 +02:00
• 7534eec921 towards fiducial detection Thierry Zamofing 2022-09-15 14:46:30 +02:00
• e4b3ad0b5f add workbench autofocus.py Thierry Zamofing 2022-09-15 07:44:02 +02:00
• 14260851cf enhance calibration + minor fixes Thierry Zamofing 2022-09-14 09:36:20 +02:00
• e215f3abea fix in trace and app config Thierry Zamofing 2022-09-09 18:14:59 +02:00
• 31c5df6cb5 toward trace of camera Thierry Zamofing 2022-09-09 17:43:43 +02:00
• 8af0839281 enhance context menu, draw object center, recenter if image out of view Thierry Zamofing 2022-09-09 16:51:53 +02:00
• 189c98951a cleanup Thierry Zamofing 2022-09-09 15:54:18 +02:00
• f70421d2f3 avoid blocking with matplotlib, parameter save stuff Thierry Zamofing 2022-09-09 10:05:44 +02:00
• 0a15899ee6 wip Thierry Zamofing 2022-09-08 15:55:14 +02:00
• 1d26a309e7 app config, tweakers, move_* functions Thierry Zamofing 2022-09-07 18:16:59 +02:00
• 18a7b2abb4 optimize view iteractions Thierry Zamofing 2022-09-07 12:42:46 +02:00
• a2dc5c73dc coord trf looks good! Thierry Zamofing 2022-09-06 17:35:48 +02:00
• 8d8ab1a5fd wip Thierry Zamofing 2022-09-06 15:10:57 +02:00
• cbae02c597 rework graphic opbect and coordinate transformation Thierry Zamofing 2022-09-06 10:07:11 +02:00
• d263c09028 rework config/parameter setting part 2 Thierry Zamofing 2022-09-05 15:34:40 +02:00
• 8fc532d3ae rework config/parameter setting Thierry Zamofing 2022-09-05 10:30:48 +02:00
• c11e0acfcd add escape steps, collomator and post tube motion Thierry Zamofing 2022-09-02 18:40:14 +02:00
• 6e3e1cd8ab major fixes in coordinate systems Thierry Zamofing 2022-09-02 15:30:14 +02:00
• 45e8ab680f refactoring and log of coorinate work Thierry Zamofing 2022-09-02 12:46:51 +02:00
• a54e580664 wip Thierry Zamofing 2022-09-01 13:29:57 +02:00
• 1d818568f5 try avoid camera deadlock Thierry Zamofing 2022-09-01 08:00:42 +02:00
• d96f3cc9db use groupItem for tracked object Thierry Zamofing 2022-09-01 07:59:21 +02:00
• d29a961763 refactoring and other stuff Thierry Zamofing 2022-08-31 13:03:17 +02:00
• e651fddd56 first simulated datapoint collection... but something wrong in coord trf Thierry Zamofing 2022-08-30 18:08:53 +02:00
• 7deda365c1 saving document, plane and fiducal fitter Thierry Zamofing 2022-08-30 15:46:45 +02:00
• 011eaa3e31 towards least_square_trf Thierry Zamofing 2022-08-29 17:38:40 +02:00
• 9f32dd657c working json document type Thierry Zamofing 2022-08-29 11:20:28 +02:00
• b52fa6d9bd towards document type Thierry Zamofing 2022-08-26 19:10:23 +02:00
• 8fbd1c56af add ModuleFixTarget tab Thierry Zamofing 2022-08-25 17:17:54 +02:00
• d625fbdfbd major restructuring but no code change: prefix functions with _OLD_ Thierry Zamofing 2022-08-24 13:49:09 +02:00
• df53197d01 wip Thierry Zamofing 2022-08-24 08:53:54 +02:00
• 1c1e93a4d2 wip Thierry Zamofing 2022-08-22 15:18:06 +02:00
• d8b34a3f99 moving config dialog to app_config Thierry Zamofing 2022-08-22 14:27:09 +02:00
• 28c94dd297 GenericDialog.py for Application Config Thierry Zamofing 2022-08-22 13:02:31 +02:00
• 0f16af5810 towards jungfrau and shapepath... Thierry Zamofing 2022-08-22 09:55:30 +02:00
• 3ef576f690 rework motor tweak Thierry Zamofing 2022-08-19 09:51:21 +02:00
• 9e72b681a4 add fixed target ROI Thierry Zamofing 2022-08-18 12:52:11 +02:00
• c4cdf15bad wip Thierry Zamofing 2022-08-17 20:01:56 +02:00
• 22fcad62c1 moving ROI with stage and zoom Thierry Zamofing 2022-08-17 12:04:51 +02:00
• aa9a2c9948 lot a small steps... Thierry Zamofing 2022-08-16 18:45:26 +02:00
• ed3502f002 fixing pix2pos matrixes Thierry Zamofing 2022-08-16 15:46:27 +02:00