slic/furka
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

XRD update

Browse Source
This commit is contained in:
gac-furka
2021-07-14 21:32:45 +02:00
parent cc5b4763b3
commit 22422cd371
2 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
furka.py
View File

@ -20,28 +20,29 @@ mot_y = Motor("SATES30-RETRO:MOT_Y", name="Retro Y")
mot_z = Motor("SATES30-RETRO:MOT_Z", name="Retro Z")
mot_theta = Motor("SATES30-RETRO:MOT_RY", name="Retro Theta")
#CH0 = PVAdjustable("SATES30-LSCP10-FNS:CH0:VAL_GET")
und = Undulators(name="Undulators")
channels = [
# "SATES30-CAMS182-GIGE1:FPICTURE",
"SATFE10-PEPG046:FCUP-INTENSITY-CAL",
"SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG",
"SATES30-LSCP10-FNS:CH0:VAL_GET",
"SATES30-LSCP10-FNS:CH1:VAL_GET",
"SATES30-LSCP10-FNS:CH4:VAL_GET"
]
pvs = [
"SATES30-LSCP10-FNS:CH0:VAL_GET",
"SATES30-LSCP10-FNS:CH1:VAL_GET",
"SATES30-LSCP10-FNS:CH4:VAL_GET"
"SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG"
]
instrument = "furka"
pgroup = "p19197"
check_intensity = PVCondition("SATFE10-PEPG046:FCUP-INTENSITY-CAL", vmin=5, vmax=None, wait_time=3, required_fraction=0.8)
#check_intensity = None
#check_intensity = PVCondition("SATFE10-PEPG046:FCUP-INTENSITY-CAL", vmin=5, vmax=None, wait_time=3, required_fraction=0.8)
check_intensity = None
daq = SFAcquisition(instrument, pgroup, default_channels=channels, default_pvs=pvs, rate_multiplicator=1)
scan = Scanner(default_acquisitions=[daq], condition=check_intensity)

12
undulator.py
View File

@ -9,12 +9,12 @@ from slic.core.scanner.scanbackend import wait_for_all #, stop_all
# 14 is the CHIC
n_unds = [
6, 7, 8, 9, 10, 11, 12, 13,
15, 16, 17, 18, 19, 20, 21, 22
6, 13,
15, 16, 17, 18, 19, 20, 21
]
und_names = [f"SATUN{n:02}-UIND030" for n in n_unds]
und_name_cal = "SATUN13-UIND030"
und_name_cal = "SATUN06-UIND030"
@ -64,9 +64,9 @@ class Undulators(Adjustable):
t = a.set_target_value(k_new, hold=False)
tasks.append(t)
wait_for_all(tasks)
print("CHIC adjustment follows")
self.chic.set_target_value(value, hold=False).wait() #TODO: test whether an additional sleep is needed
print("CHIC adjustment done")
# print("CHIC adjustment follows")
# self.chic.set_target_value(value, hold=False).wait() #TODO: test whether an additional sleep is needed
# print("CHIC adjustment done")
return self._as_task(change, hold=hold)