From 882c5cd4d326ffec2cc5f6ccc9e88a0aa269dba4 Mon Sep 17 00:00:00 2001 From: Vonka Jakub Date: Mon, 28 Apr 2025 14:46:04 +0200 Subject: [PATCH] After March2025 beamtime --- beamline/photon_energy.py | 10 +++++----- exp_temp/SAT.py | 18 ++++++++++++++++++ pgroups.py | 4 ++-- 3 files changed, 25 insertions(+), 7 deletions(-) create mode 100644 exp_temp/SAT.py diff --git a/beamline/photon_energy.py b/beamline/photon_energy.py index 3310b03..84af5e2 100755 --- a/beamline/photon_energy.py +++ b/beamline/photon_energy.py @@ -27,15 +27,15 @@ N_UNDS = list(range(3, 15 + 1)) ### SETTINGS #### PSSS_MOVE = True -DCCM_MOVE = False +DCCM_MOVE = True TRAJECTORY_FEEDBACK_DISABLE_ENABLE = False POINTING_FEEDFORWARD = False -energy_offset_undulators = -21 # eV -energy_offset_PSSS = -9 # eV -energy_offset_DCCM = -11 # eV +energy_offset_undulators = -16 # eV +energy_offset_PSSS = -8 # eV +energy_offset_DCCM = -12 # eV -DCCM_RX2_energy_offset = 32.4 # eV +DCCM_RX2_energy_offset = 17.2 # eV ################ diff --git a/exp_temp/SAT.py b/exp_temp/SAT.py new file mode 100644 index 0000000..e778a4b --- /dev/null +++ b/exp_temp/SAT.py @@ -0,0 +1,18 @@ +import time + +print("SAT functions") + +def move_in_steps(axis, steps, delay_per_step=1): + for step in steps: + start_time = time.time() + + axis.set_target_value(step) + while axis.is_moving(): + time.sleep(0.1) + + elapsed = time.time() - start_time + wait_time = max(0, delay_per_step-elapsed) + time.sleep(wait_time) + + + diff --git a/pgroups.py b/pgroups.py index 1fb969b..c049f8e 100755 --- a/pgroups.py +++ b/pgroups.py @@ -44,9 +44,9 @@ pgroup_scratch = "p19150" # Scratch # pgroup = "p22214" # CrQ in-house DilSc 2024-11-15 # pgroup = "p22199" # CrQ commissioning PuMa 2024-11-22 -# pgroup = "p22259" # Cr-Bl commissioning Jan 2025 +pgroup = "p22259" # Cr-Bl commissioning Jan 2025 # pgroup = "p22226" # CrMX user Nogly 2025-02-21 -pgroup = "p22478" # Cr-Q commissioning Mar-Apr 2025 +# pgroup = "p22478" # Cr-Q commissioning Mar-Apr 2025