From ab4a80c2cbc7346c1bf161252add46075e05e09d Mon Sep 17 00:00:00 2001 From: gac bernina Date: Fri, 5 Jun 2026 16:09:09 +0200 Subject: [PATCH] fixes --- eco/bernina/bernina.py | 56 ++++++----- eco/endstations/bernina_incoupling.py | 139 ++++++++++++++------------ eco/endstations/bernina_rixs.py | 2 +- eco/timing/timing_diag.py | 12 +-- 4 files changed, 113 insertions(+), 96 deletions(-) diff --git a/eco/bernina/bernina.py b/eco/bernina/bernina.py index 7995f73..bee0d53 100644 --- a/eco/bernina/bernina.py +++ b/eco/bernina/bernina.py @@ -1185,6 +1185,7 @@ namespace.append_obj( "RIXS", lazy=True, name="rixs", + jf_id="JF14T01V01", config_jf_adj=config_JFs, pgroup_adj=config_bernina.pgroup, module_name="eco.endstations.bernina_rixs", @@ -1572,30 +1573,39 @@ class Incoupling(Assembly): # self._append( # SmaractRecord, "SARES20-MCS2:MOT_15", name="thz_par2_rx", is_setting=True # ) - self._append( - SmaractRecord, "SARES20-MCS2:MOT_11", name="thz_par1_z", is_setting=True - ) - self._append( - SmaractRecord, "SARES20-MCS2:MOT_17", name="thz_par1_ry", is_setting=True - ) + # self._append( + # SmaractRecord, "SARES20-MCS2:MOT_11", name="thz_par1_z", is_setting=True + # ) + # self._append( + # SmaractRecord, "SARES20-MCS2:MOT_17", name="thz_par1_ry", is_setting=True + # ) + # try: + # self.motor_configuration_thorlabs = { + # "thz_filter": { + # "pvname": "SLAAR21-LMOT-ELL4", + # }, + # "thz_crystal": { + # "pvname": "SLAAR21-LMOT-ELL3", + # }, + # "thz_waveplate": { + # "pvname": "SLAAR21-LMOT-ELL5", + # }, + # "nd_filter": { + # "pvname": "SLAAR21-LMOT-ELL2", + # }, + # "polarizer": { + # "pvname": "SLAAR21-LMOT-ELL1", + # }, + # } try: self.motor_configuration_thorlabs = { - "thz_filter": { - "pvname": "SLAAR21-LMOT-ELL4", - }, - "thz_crystal": { - "pvname": "SLAAR21-LMOT-ELL3", - }, - "thz_waveplate": { + "hwp": { "pvname": "SLAAR21-LMOT-ELL5", }, - "nd_filter": { + "fw": { "pvname": "SLAAR21-LMOT-ELL2", }, - "polarizer": { - "pvname": "SLAAR21-LMOT-ELL1", - }, } ### thorlabs piezo motors ### @@ -1613,9 +1623,9 @@ class Incoupling(Assembly): # self._append( # SmaractRecord, "SARES20-MCS2:MOT_18", name="opa_mirr2_ry", is_setting=True # ) - self._append( - SmaractRecord, "SARES20-MCS2:MOT_10", name="tt_nopa_target", is_setting=True - ) + # self._append( + # SmaractRecord, "SARES20-MCS2:MOT_10", name="tt_nopa_target", is_setting=True + # ) self._append( AnalogOutput, "SLAAR21-LDIO-LAS6991:DAC07_VOLTS", @@ -1629,9 +1639,9 @@ class Incoupling(Assembly): is_setting=True, ) - self._append(MotorRecord, "SARES20-XPS1:MOT_X", name="lens_z", is_setting=True) - self._append(MotorRecord, "SARES20-XPS1:MOT_Y", name="lens_x", is_setting=True) - self._append(MotorRecord, "SARES20-XPS1:MOT_Z", name="lens_y", is_setting=True) + self._append(MotorRecord, "SARES20-XPS1:MOT_1", name="lens_z", is_setting=True) + self._append(MotorRecord, "SARES20-XPS1:MOT_2", name="lens_x", is_setting=True) + self._append(MotorRecord, "SARES20-XPS1:MOT_3", name="lens_y", is_setting=True) # self._append( # MotorRecord, "SARES20-MF1:MOT_13", name="eos_mirr", is_setting=True # ) diff --git a/eco/endstations/bernina_incoupling.py b/eco/endstations/bernina_incoupling.py index 06bc69a..07fad2d 100644 --- a/eco/endstations/bernina_incoupling.py +++ b/eco/endstations/bernina_incoupling.py @@ -22,32 +22,39 @@ class Incoupling(Assembly): # self._append( # SmaractRecord, "SARES20-MCS2:MOT_15", name="thz_par2_rx", is_setting=True # ) - self._append( - SmaractRecord, "SARES20-MCS2:MOT_11", name="thz_par1_z", is_setting=True - ) - self._append( - SmaractRecord, "SARES20-MCS2:MOT_17", name="thz_par1_ry", is_setting=True - ) + # self._append( + # SmaractRecord, "SARES20-MCS2:MOT_11", name="thz_par1_z", is_setting=True + # ) + # self._append( + # SmaractRecord, "SARES20-MCS2:MOT_17", name="thz_par1_ry", is_setting=True + # ) try: self.motor_configuration_thorlabs = { - "thz_filter": { - "pvname": "SLAAR21-LMOT-ELL4", - }, - "thz_crystal": { - "pvname": "SLAAR21-LMOT-ELL3", - }, - "thz_waveplate": { + # "thz_filter": { + # "pvname": "SLAAR21-LMOT-ELL4", + # }, + # "thz_crystal": { + # "pvname": "SLAAR21-LMOT-ELL3", + # }, + # "thz_waveplate": { + # "pvname": "SLAAR21-LMOT-ELL5", + # }, + # "nd_filter": { + # "pvname": "SLAAR21-LMOT-ELL2", + # }, + # "polarizer": { + # "pvname": "SLAAR21-LMOT-ELL1", + # }, + + "waveplate": { "pvname": "SLAAR21-LMOT-ELL5", }, - "nd_filter": { + "filter_wheel": { "pvname": "SLAAR21-LMOT-ELL2", }, - "polarizer": { - "pvname": "SLAAR21-LMOT-ELL1", - }, - } + } ### thorlabs piezo motors ### for name, config in self.motor_configuration_thorlabs.items(): self._append( @@ -60,24 +67,24 @@ class Incoupling(Assembly): except Exception as e: print(e) - self._append( - AdjustableInterpolate, - self.nd_filter, - filename_calib="/sf/bernina/code/gac-bernina/eco_cnf_bernina/reference_values/nd_filter_wheel_thlabs.json", - deadband=None, - interp_method="next", - callbacks_before_change=[], - callbacks_after_change=[], - unit="OptDens", - name="nd_filter_optical_density", - ) + # self._append( + # AdjustableInterpolate, + # self.nd_filter, + # filename_calib="/sf/bernina/code/gac-bernina/eco_cnf_bernina/reference_values/nd_filter_wheel_thlabs.json", + # deadband=None, + # interp_method="next", + # callbacks_before_change=[], + # callbacks_after_change=[], + # unit="OptDens", + # name="nd_filter_optical_density", + # ) - self._append( - SmaractRecord, "SARES20-MCS2:MOT_18", name="opa_mirr2_ry", is_setting=True - ) - self._append( - SmaractRecord, "SARES20-MCS2:MOT_10", name="tt_nopa_target", is_setting=True - ) + # self._append( + # SmaractRecord, "SARES20-MCS2:MOT_18", name="opa_mirr2_ry", is_setting=True + # ) + # self._append( + # SmaractRecord, "SARES20-MCS2:MOT_10", name="tt_nopa_target", is_setting=True + # ) self._append( AnalogOutput, "SLAAR21-LDIO-LAS6991:DAC07_VOLTS", @@ -91,56 +98,56 @@ class Incoupling(Assembly): is_setting=True, ) - self._append(MotorRecord, "SARES20-XPS1:MOT_5", name="lens_z", is_setting=True) - self._append(MotorRecord, "SARES20-XPS1:MOT_6", name="lens_x", is_setting=True) - self._append(MotorRecord, "SARES20-XPS1:MOT_4", name="lens_y", is_setting=True) + self._append(MotorRecord, "SARES20-XPS1:MOT_1", name="lens_z", is_setting=True) + self._append(MotorRecord, "SARES20-XPS1:MOT_2", name="lens_x", is_setting=True) + self._append(MotorRecord, "SARES20-XPS1:MOT_3", name="lens_y", is_setting=True) # self._append( # MotorRecord, "SARES20-MF1:MOT_13", name="eos_mirr", is_setting=True # ) - self._append( - AnalogOutput, - "SLAAR21-LDIO-LAS6991:DAC06_VOLTS", - name="eos_fb_rx", - is_setting=True, - ) - self._append( - AnalogOutput, - "SLAAR21-LDIO-LAS6991:DAC05_VOLTS", - name="eos_fb_ry", - is_setting=True, - ) + # self._append( + # AnalogOutput, + # "SLAAR21-LDIO-LAS6991:DAC06_VOLTS", + # name="eos_fb_rx", + # is_setting=True, + # ) + # self._append( + # AnalogOutput, + # "SLAAR21-LDIO-LAS6991:DAC05_VOLTS", + # name="eos_fb_ry", + # is_setting=True, + # ) self._append( AdjustablePv, pvsetname="SLAAR21-LCAM-C561:FIT2_REQUIRED.PROC", - name="eos_fb_setpoint_rq", + name="fb_setpoint_rq", accuracy=1, is_setting=True, ) self._append( AdjustablePv, pvsetname="SLAAR21-LCAM-C561:FIT2_DEFAULT.PROC", - name="eos_fb_setpoint_df", + name="fb_setpoint_df", accuracy=1, is_setting=True, ) self._append( AdjustablePv, pvsetname="SLAAR21-LTIM01-EVR0:CALCW.A", - name="eos_fd_enable", + name="fd_enable", accuracy=1, is_setting=True, ) - self._append( - AdjustableVirtual, - [self.thz_crystal, self.thz_waveplate], - lambda c, w: c, - lambda angle: [angle, angle / 2], - name="thz_polarization", - is_setting=False, - ) + # self._append( + # AdjustableVirtual, + # [self.thz_crystal, self.thz_waveplate], + # lambda c, w: c, + # lambda angle: [angle, angle / 2], + # name="thz_polarization", + # is_setting=False, + # ) self._append( DetectorPvData, @@ -154,11 +161,11 @@ class Incoupling(Assembly): name="pump_intensity", ) - self._append( - DetectorPvData, - "SARES20-LSCP9-FNS:CH6:VAL_GET", - name="shg_intensity", - ) + # self._append( + # DetectorPvData, + # "SARES20-LSCP9-FNS:CH6:VAL_GET", + # name="shg_intensity", + # ) # IOXAS (SARES20_CH6) # self._append( diff --git a/eco/endstations/bernina_rixs.py b/eco/endstations/bernina_rixs.py index b9e14aa..5eef4c8 100644 --- a/eco/endstations/bernina_rixs.py +++ b/eco/endstations/bernina_rixs.py @@ -308,7 +308,7 @@ class RIXS(Assembly): self, name=None, pvname="SARES22-RIXS", - jf_id="JF05T01V01", + jf_id="JF14T01V01", config_jf_adj=None, pgroup_adj=None, alias_namespace=None, diff --git a/eco/timing/timing_diag.py b/eco/timing/timing_diag.py index d22e3c0..a61178b 100644 --- a/eco/timing/timing_diag.py +++ b/eco/timing/timing_diag.py @@ -292,9 +292,9 @@ class TimetoolBerninaUSD(Assembly): for pos in x: print(f"Moving to {pos*1e15} fs") self.delay.set_target_value(pos).wait() - pids_start.append(pid.value) + pids_start.append(int(pid.value)) sleep(seconds) - pids_stop.append(pid.value) + pids_stop.append(int(pid.value)) retrieving = True i = 1 source = dh.Daqbuf() @@ -401,10 +401,10 @@ class TimetoolBerninaUSD(Assembly): fig.tight_layout() plt.show() if to_elog: - fpath = "/photonics/home/gac-bernina/tt_calib.jpg" + fpath = "/home/gac-bernina/tt_calib.jpg" fig.savefig(fpath, dpi=200) fpath = Path(fpath) - dpath = Path("/photonics/home/gac-bernina/tt_calib.pkl") + dpath = Path("/home/gac-bernina/tt_calib.pkl") df = DataFrame({"tt_kb.delay": x, "tt_kb.edge_position_px": y}) df.to_pickle(dpath) if to_elog: @@ -767,10 +767,10 @@ class TimetoolBerninaDSD(Assembly): fig.tight_layout() plt.show() if to_elog: - fpath = "/photonics/home/gac-bernina/tt_calib.jpg" + fpath = "/home/gac-bernina/tt_calib.jpg" fig.savefig(fpath, dpi=200) fpath = Path(fpath) - dpath = Path("/photonics/home/gac-bernina/tt_calib.pkl") + dpath = Path("/home/gac-bernina/tt_calib.pkl") df = DataFrame({"tt_kb.delay": x, "tt_kb.edge_position_px": y}) df.to_pickle(dpath) if to_elog: