After March2025 beamtime

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
 
 ################
 

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)
+        
+
+

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