Bring Jul updates

This commit is contained in:
gac-furka
2024-07-08 11:20:26 +02:00
parent f7ee0918c3
commit 5f7a497ee8
5 changed files with 210 additions and 13 deletions

View File

@ -60,7 +60,6 @@ parab_RY = Motor("SATES30-MCS001:MOT_4", name="Parab RY")
parab_RX = Motor("SATES30-MCS001:MOT_7", name="Parab RX")
taget_along_beam = SmarActAxis("SATES30-XSMA184:MOT6", name="Target along beam")
#Retro Chamber Motors
#mot_x = Motor("SATES30-RETRO:MOT_X", name="Retro X")
#mot_y = Motor("SATES30-RETRO:MOT_Y", name="Retro Y")
@ -157,7 +156,7 @@ tth_scan = Coupled_tth(delta=0, name="theta 2theta")
tth_scan_RIXS = Coupled_tth_RIXSside(delta=0, name='theta 2theta RIXS side')
tth_scan_outer = Coupled_tth_outer(delta=0, name="theta 2theta outer")
Thz_Gate_scan = Coupled_THzGate( name = "THz Gate coupled ")
Thz_Gate_scan_fixedD = Coupled_THzGate_fixedDelta(delta=60.65, name = "Thz Gate fix Delta")
Thz_Gate_scan_fixedD = Coupled_THzGate_fixedDelta(delta=73.11, name = "Thz Gate fix Delta")
GRX = Motor("SATES30-RIXS:MOT_GRX", name = "Pitch grating")
DTZ = Motor("SATES30-RIXS:MOT_DTZ", name = "DTZ (r2)")
@ -185,6 +184,7 @@ Thz_delay = Motor("SLAAT31-LMOT-M806:MOT", name="Thz Delay")
WL_delay = Motor("SLAAT31-LMOT-M807:MOT", name="WL Delay")
gate_delay = Motor("SLAAT31-LMOT-M808:MOT", name="Gate Delay")
twomicron_delay = Motor("SLAAT31-LMOT-M813:MOT", name="2um Delay")
ss_EO_gate = PVAdjustable("SLAAT31-LMTS-SMAR13:DRIVE", pvname_readback="SLAAT31-LMTS-SMAR13:MOTRBV", name="ss EO Gate Delay")
#laser_WP = Motor("SLAAT31-LMOT-M801:MOT", name="Laser WavePlate")
laser_WP = Motor("SLAAT31-LMOT-M809:MOT", name="Laser WavePlate")
@ -206,7 +206,7 @@ spreadsheet = Spreadsheet(spreadsheet_info, placeholders=["comment", "sample"],
instrument = "furka"
pgroup = "p21613" #User p group
pgroup = "p21645" #User p group
#check_intensity = PVCondition("SATFE10-PEPG046:FCUP-INTENSITY-CAL", vmin=5, vmax=None, wait_time=3, required_fraction=0.8)
check_intensity = PVCondition("SATBD01-DBPM060:Q2", vmin=5, vmax=None, wait_time=1, required_fraction=0.8)
@ -306,9 +306,11 @@ def KBh_Pointing(KBh_RYv):
print("KBh pointing change done")
def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v, KBh_B1v, KBh_B2v, KBv_RXv, KBh_RYv ):
def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v, KBh_B1v, KBh_B2v, KBv_RXv, KBh_RYv, DC_updownv ):
#close shutter
caput('SATOP31-OPSH138:REQUEST', 'close')
caput('SATES30-MCS003:MOT_5.VAL', DC_updownv)
print("DC target moved")
KBv_Focusing(KBv_B1v, KBv_B2v)
KBv_Pointing(KBv_RXv)
KBh_Focusing(KBh_B1v, KBh_B2v)
@ -320,8 +322,7 @@ def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v,
else:
caput('SLAAT01-LTIM-PDLY:NORMAL.PROC', 1 )
print("delay mode done")
Mon_ES.set_target_value(ESv).wait()
print("Mono done")
#Mon_ES.set_target_value(ESv).wait()
gas_attenuator_trans.set_target_value(GAv).wait()
print("GA done")
mono_new.set_target_value( MonoNewv).wait()
@ -334,15 +335,15 @@ def GoToXAS_RIXS(TRYv, Del_or_Norm, ESv, GAv, MonoNewv, HWPv, KBv_B1v, KBv_B2v,
@as_shortcut
def TrXAS_pos(name = "TrXAS Positions"):
GoToXAS_RIXS(85, "Del", 400, 1.0, 529, 42, 3.221, 3.444, 3.723, 3.917, 13.218, 13.215)
GoToXAS_RIXS(85, "Del", 400, 1.0, 528.6, 44, 3.221, 3.444, 3.723, 3.917, 13.218, 13.215, -11.8)
@as_shortcut
def RIXS_pos(name = "RIXS Positions"):
GoToXAS_RIXS(85, "Norm", 200, 0.8, 529, 42, 3.0209, 3.2439, 3.023, 3.217, 13.233, 13.245)
GoToXAS_RIXS(85, "Norm", 100, 0.8, 528.6, 44, 3.0678, 3.3279, 3.023, 3.217, 13.233, 13.245, 4)
@as_shortcut
def EOS_pos(name = "EOS Positions"):
Diffr_pos(148.335, 74.5, 0, 3.0, -6.5, 0, -90, -3.0)
Diffr_pos(148.26, 80.5, 1.3, 5.12, -3.0, 0, -90, -4.0)
@as_shortcut
def CTape_pos(name = "X-ray knife edge"):
@ -362,7 +363,7 @@ def xray_knife(name = "X-ray knife edge"):
@as_shortcut
def Transfer_pos(name = "Transfer Positions"):
Diffr_pos(148.40, 80.5, 4.21, -3.5, -10.93, 0, 50, -1.95)
Diffr_pos(148.40, 80.5, 4.21, -2.0, -0.5, 0, 60, 0)
print("To start the GUI, run: gui()")