added I0 and fixed few things

This commit is contained in:
gac-furka
2022-02-15 16:14:50 +01:00
parent bc08e0f7c4
commit 6fb345b522

View File

@ -26,16 +26,20 @@ mot_theta = Motor("SATES30-RETRO:MOT_RY", name="Retro Theta")
retro = SimpleDevice("Retro Stages", x=mot_x, y=mot_y, z=mot_z, theta=mot_theta)
#CH0 = PVAdjustable("SATES30-LSCP10-FNS:CH0:VAL_GET")
KBV_RX = PVAdjustable("SATOP31-OKBV178:W_RX.VAL", pvname_moving="SATOP31-OKBV178:MOVING", name = "KB_Vertical_RX")
#KBV_RX = PVAdjustable("SATOP31-OKBV178:W_RX.VAL", process_time=1, name = "KBV_RX")
KBH_RY = PVAdjustable("SATOP31-OKBH179:W_RY.VAL", pvname_moving="SATOP31-OKBH179:MOVING", name = "KB_Horiz_RY")
#KBH_RY = PVAdjustable("SATOP31-OKBH179:W_RY.VAL", process_time=1, name = "KBH_RY")
#mono_slits = PVAdjustable("SATOP11-OSGM087:EXITSLIT",pvname_done_moving="SATOP31-OEXS132:MOT_H.DMOV", name = "Mono_Slits" )
n_und_ref = 6
n_und_ref = 12
n_unds = [
6, 7, 8, 9, 10, 11, 12, 13, # 14 is the CHIC
15, 16, 17, 18, 19, 20, 21, 22
]
chic_fudge_offset = 0
Mon2Unds_offset = 8.5
Mon2Unds_offset = -2.
und = Undulators(n_unds, n_und_ref, chic_fudge_offset, name="z Athos Undulators")
#und = Undulators(name="Undulators")
@ -57,12 +61,15 @@ channels = [
"SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG",
"SATES30-LSCP10-FNS:CH0:VAL_GET",
"SATES30-LSCP10-FNS:CH1:VAL_GET",
"SATES30-LSCP10-FNS:CH2:VAL_GET",
"SATES30-LSCP10-FNS:CH4:VAL_GET",
# "SATES30-LSCP10-FNS:CH0:WFMi",
# "SATES30-LSCP10-FNS:CH0:WFMi"
"SATES21-CAMS-PATT1:intensity",
"SATES21-CAMS-PATT1:x_profile",
"SATES21-CAMS-PATT1:y_profile",
"SATES21-CAMS-PATT1:FPICTURE"
"SATES21-CAMS-PATT1:FPICTURE",
"SATES21-CAMS-PATT1:spectrum"
]
pvs = [
@ -83,7 +90,7 @@ live_channels = [
instrument = "furka"
pgroup = "p19197" #Commissioning p group
pgroup = "p19735" #Commissioning p group
#check_intensity = PVCondition("SATFE10-PEPG046:FCUP-INTENSITY-CAL", vmin=5, vmax=None, wait_time=3, required_fraction=0.8)
check_intensity = None