Commit Graph

Select branches

Hide Pull Requests

master

#1

#2

Mono Color

• b81e4cf303 removed log for cleanup master steppke_a 2025-11-25 15:55:40 +01:00
• ba6129ede7 cleanup steppke_a 2025-11-25 15:32:52 +01:00
• 6d277d4e71 after p22760 before cleanup steppke_a 2025-11-25 15:09:12 +01:00
• 84948e2b7f updates for p22761 PuMa steppke_a 2025-09-11 17:38:48 +02:00
• cce4cf69ed added PuMa module steppke_a 2025-09-11 17:38:12 +02:00
• 89c10bb5f4 during beamtime p22266, sync, channels, etc. steppke_a 2025-07-11 09:51:13 +02:00
• 8284d9fe69 updated bs channels steppke_a 2025-07-04 17:53:41 +02:00
• 958df3ee6e added Lakeshore calibration curves steppke_a 2025-07-04 16:54:18 +02:00
• e7a5ce29f0 before user beamtime p22266 steppke_a 2025-07-04 16:52:50 +02:00
• 5d6769df0a Removing Untitled.ipynb vonka_j 2025-05-01 15:52:25 +02:00
• 8b73fa2419 Focusing notebook created and focusing.py modified vonka_j 2025-05-01 15:49:58 +02:00
• 882c5cd4d3 After March2025 beamtime vonka_j 2025-04-28 14:46:04 +02:00
• c5688804b0 function added to enable/disable all diffractometer axes vonka_j 2025-04-28 12:16:45 +02:00
• d57b964b33 Adding some channels. The diffractometer_extras_pvs still need more work vonka_j 2025-04-28 11:57:26 +02:00
• 505c0ae6d4 Changes in focusing script during the beamtime, this will need some more work vonka_j 2025-04-28 11:53:36 +02:00
• 1bc2c38f62 Adding code to upload calibration curves to the LakeShore372 vonka_j 2025-04-28 11:50:29 +02:00
• 7cedef60c2 Fixing time in spreadsheet so that gui works again vonka_j 2025-04-28 11:48:08 +02:00
• a6cace5223 Added PIDs to ECMC motors vonka_j 2025-04-16 16:17:09 +02:00
• befcebb9b7 Swapped deadband assignment and applied to diffractometer initialisation vonka_j 2025-04-16 15:44:10 +02:00
• ca3a5199b6 Added deadbands for diffractometer motors vonka_j 2025-04-16 14:58:02 +02:00
• 64616cf98e Merge branch 'CLEANUP' into 'master' steppke_a 2025-03-29 18:05:09 +01:00
• 22c061d83e Beginning beamtime March 29.03.2025 steppke_a 2025-03-29 18:03:04 +01:00
• ea8b8d6058 Setting up all slits to have consistent naming and definitions vonka_j 2025-03-27 15:54:21 +01:00
• 8a6f254dc8 Added I0 chamber vonka_j 2025-03-27 10:44:22 +01:00
• 3d20248efe Adding mono + commit after the sticky bit. vonka_j 2025-03-27 09:42:30 +01:00
• dbf50d3eb9 handle case where PV returns None augustin_s 2025-02-25 11:17:13 +01:00
• 792e562d48 before MX beamtime October 2024 steppke_a 2024-10-23 17:59:59 +02:00
• 4bf7321e2d during p21977 steppke_a 2024-06-21 20:00:19 +02:00
• 8e52fd376d changed to 1.5M JF steppke_a 2024-06-19 17:18:03 +02:00
• 59d203b86a before LiErF4 beamtime steppke_a 2024-06-19 17:15:31 +02:00
• 561fbaee6f past p21736 Cr-MX Weik 2024-06-07 changes steppke_a 2024-06-10 13:49:19 +02:00
• faffe10be5 reorganized channels and shutter steppke_a 2024-05-27 17:31:44 +02:00
• bb2eec0da6 cleaned up attenuators steppke_a 2024-05-27 17:13:04 +02:00
• 30fc25aea9 fixed acquisitions as well steppke_a 2024-05-27 17:08:28 +02:00
• 1d6121239e spreadsheet now works again steppke_a 2024-05-27 16:57:39 +02:00
• 96802c13d3 re-enabled spreadsheet steppke_a 2024-05-27 16:21:58 +02:00
• 90e12fc814 large reorganization, part 1 done steppke_a 2024-05-27 16:09:46 +02:00
• ffbfa2ba92 after beamtime May 2024 steppke_a 2024-05-16 14:30:23 +02:00
• a65e9070eb start of beamtime p21741 steppke_a 2024-05-07 11:29:52 +02:00
• f9d036bb9e added DilSc steppke_a 2024-03-14 18:43:17 +01:00
• 2555812844 p21640 beamtime steppke_a 2024-03-14 18:40:58 +01:00
• 6db59c509e start of p21640 beamtime steppke_a 2024-03-05 20:21:07 +01:00
• 8054e1d48c further cleanup steppke_a 2023-12-13 14:33:46 +01:00
• 7b9f3fa9b7 post-p21592 HVE commissioning cleanup steppke_a 2023-12-13 14:25:59 +01:00
• a40a4be2b4 startup of p21563 beamtime steppke_a 2023-11-17 11:56:33 +01:00
• afde091b4e acquisition examples and cleanup steppke_a 2023-11-13 11:31:57 +01:00
• 2b61757705 logging rotation and in pgroup steppke_a 2023-10-16 19:02:49 +02:00
• f88409954a small additions to channels and base steppke_a 2023-10-16 14:53:26 +02:00
• 5ac9ed4456 added detector configuration steppke_a 2023-09-25 17:21:12 +02:00
• 334d41508f update before beamtime steppke_a 2023-09-25 13:23:47 +02:00
• 9ae13f6c8e cleanup part 2 steppke_a 2023-09-13 17:53:03 +02:00
• ef7007582f large cleanup, part 1 steppke_a 2023-09-13 17:29:36 +02:00
• 89a76ee62a more scrap steppke_a 2023-05-16 13:56:06 +02:00
• f7a117fd6e a rough patchwork steppke_a 2023-05-16 13:53:11 +02:00
• 9c59d52d5c Mobile JJ slits added vonka_j 2023-05-09 18:22:18 +02:00
• 24a2a465c5 Post beamtime cleanup vonka_j 2023-03-15 13:54:26 +01:00
• 88884f73ae Adding Smaract XYZ vonka_j 2023-02-20 17:33:17 +01:00
• 9b17565dce Channel list cleanup and split to bs_channels and pv_channels vonka_j 2023-02-16 20:03:55 +01:00
• 89a1dc134d Alignment laser added vonka_j 2023-02-03 16:47:15 +01:00
• 9be95ff4f6 Finally cleaned-up channels list vonka_j 2023-02-01 16:50:39 +01:00
• bde341d03f Finally cleaned-up channels list vonka_j 2023-02-01 16:47:05 +01:00
• 2ab449fe17 Pulsed magnet pulse method added - temporarily in the cristallina.py vonka_j 2023-01-27 16:15:47 +01:00
• 542e5e7fea channel_update vonka_j 2023-01-26 18:23:05 +01:00
• 2ed4344b5b inprints script improved vonka_j 2022-10-18 18:59:59 +02:00
• 2134451874 inprints script work vonka_j 2022-10-18 12:45:10 +02:00
• 2c7fd3ffa6 updating imporints vonka_j 2022-10-05 19:16:47 +02:00
• f292e04666 KBs added vonka_j 2022-10-04 18:48:21 +02:00
• 1e5628105f started inprints script Jakub Vonka 2022-10-03 22:59:54 +02:00
• 95cefd12d7 move() added Jakub Vonka 2022-10-03 22:28:12 +02:00
• 1769ae3aa3 attocube axes are scannable now + added axis.config vonka_j 2022-10-03 19:20:34 +02:00
• 60639923cb Added sleep time for move attempt vonka_j 2022-09-27 11:28:03 +02:00
• 0894be1f8f Updated move() to try a few times for the last 2um of motion. vonka_j 2022-09-23 17:22:59 +02:00
• 4ae527f451 Updated is_at_target to accept calculated value from readback and not just an epics pv flag. vonka_j 2022-09-23 16:40:49 +02:00
• 9161edcb82 Added fast pulse picker shutter vonka_j 2022-09-23 16:12:58 +02:00
• 4d4a6d64fb Added upstream front end attenuator vonka_j 2022-09-23 12:52:32 +02:00
• 26fd665b03 Added gas detector minimum value condition for scanner vonka_j 2022-09-23 12:31:35 +02:00
• 362daa7846 Added attocube module vonka_j 2022-09-23 09:36:33 +02:00
• 33ff2c9722 removed extra module loader vonka_j 2022-09-20 14:52:23 +02:00
• 92b17647f9 updated with slic master branch vonka_j 2022-09-20 14:45:33 +02:00
• 8e82ddcc67 test for upstream merging steppke_a 2022-09-12 10:58:49 +02:00
• b075deff70 Merge branch 'master' into 'master' augustin_s 2022-09-12 08:53:47 +00:00
• 323352a8c1 Merge branch 'master' of https://gitlab.psi.ch/slic/cristallina steppke_a 2022-09-06 14:33:02 +02:00
• 00fe2b6844 Initial slic setup at cristallina steppke_a 2022-09-06 14:32:45 +02:00
• d95fff5810 add README augustin_s 2022-05-06 08:26:52 +02:00
• c86c64e96e add README.md steppke_a 2022-05-05 22:05:45 +02:00