update Oct2024 Beamtime

This commit is contained in:
gac-furka
2024-11-01 16:12:27 +01:00
parent 5f7a497ee8
commit d0b6ceadf3
4 changed files with 421 additions and 24 deletions

View File

@@ -206,7 +206,7 @@ spreadsheet = Spreadsheet(spreadsheet_info, placeholders=["comment", "sample"],
instrument = "furka"
pgroup = "p21645" #User p group
pgroup = "p21972" #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,23 +306,29 @@ 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, DC_updownv ):
def GoToXAS_RIXS(RYv, TwoTRYv, 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")
#caput('SATES30-MCS003:MOT_5.VAL', DC_updownv)
#print("DC target moved")
KBv_Focusing(KBv_B1v-0.1, KBv_B2v-0.1)
KBv_Focusing(KBv_B1v, KBv_B2v)
KBv_Pointing(KBv_RXv)
KBh_Focusing(KBh_B1v-0.1, KBh_B2v-0.1)
KBh_Focusing(KBh_B1v, KBh_B2v)
KBh_Pointing(KBh_RYv)
TwoTRY.set_target_value(TRYv).wait()
print("2TRY movement done")
print("KB pointing done")
TwoTRY.set_target_value(TwoTRYv).wait()
print("2TRY done")
mu.set_target_value(RYv)
print("RY movement done")
if Del_or_Norm == "Del":
caput('SLAAT01-LTIM-PDLY:DELAYEDSHOT.PROC', 1 )
else:
caput('SLAAT01-LTIM-PDLY:NORMAL.PROC', 1 )
print("delay mode done")
#Mon_ES.set_target_value(ESv).wait()
Mon_ES.set_target_value(ESv).wait()
print("Exit slit done")
gas_attenuator_trans.set_target_value(GAv).wait()
print("GA done")
mono_new.set_target_value( MonoNewv).wait()
@@ -335,23 +341,23 @@ 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, 528.6, 44, 3.221, 3.444, 3.723, 3.917, 13.218, 13.215, -11.8)
GoToXAS_RIXS(-44.8, 45, "Del", 400, 1.0, 578.2, 22.0, 3.8459, 3.8378, 3.8200, 4.0200, 13.1998, 13.11231, 0.0)
@as_shortcut
def RIXS_pos(name = "RIXS Positions"):
GoToXAS_RIXS(85, "Norm", 100, 0.8, 528.6, 44, 3.0678, 3.3279, 3.023, 3.217, 13.233, 13.245, 4)
GoToXAS_RIXS(-36.8,50, "Norm", 70, 0.2, 576.8, 22.0, 3.1890, 3.340, 3.810, 4.010, 13.188, 13.128, 4)
@as_shortcut
def EOS_pos(name = "EOS Positions"):
Diffr_pos(148.26, 80.5, 1.3, 5.12, -3.0, 0, -90, -4.0)
#@as_shortcut
#def EOS_pos(name = "EOS Positions"):
# 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"):
Diffr_pos(85, 95, -1, -1.6, -1.5, 0, -30, 0)
#@as_shortcut
#def CTape_pos(name = "X-ray knife edge"):
# Diffr_pos(85, 95, -1, -1.6, -1.5, 0, -30, 0)
@as_shortcut
def xray_knife(name = "X-ray knife edge"):
Diffr_pos(125, 165.3, 0, 2.0, -6.5, 0, -90, -3.0)
#@as_shortcut
#def xray_knife(name = "X-ray knife edge"):
# Diffr_pos(125, 165.3, 0, 2.0, -6.5, 0, -90, -3.0)
#@as_shortcut
#def Sample_position_RIXS(name = "Sample Positions RIXS"):
@@ -361,9 +367,9 @@ def xray_knife(name = "X-ray knife edge"):
#def EOS_LV_pos(name = "EOS LV Positions"):
# Diffr_pos(149.440, 29.5, 3.0, 2.5, -0.69, 15, 82, 0)
@as_shortcut
def Transfer_pos(name = "Transfer Positions"):
Diffr_pos(148.40, 80.5, 4.21, -2.0, -0.5, 0, 60, 0)
#@as_shortcut
#def Transfer_pos(name = "Transfer Positions"):
# Diffr_pos(148.40, 80.5, 4.21, -2.0, -0.5, 0, 60, 0)
print("To start the GUI, run: gui()")