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

Automatic CHIC adjustment implemented

Browse Source
This commit is contained in:
gac-furka
2021-07-17 19:09:02 +02:00
parent 67d7d34833
commit ee3da361c8
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
furka.py
View File

@ -31,16 +31,20 @@ channels = [
"SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG", "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG",
"SATES30-LSCP10-FNS:CH0:VAL_GET", "SATES30-LSCP10-FNS:CH0:VAL_GET",
"SATES30-LSCP10-FNS:CH1:VAL_GET", "SATES30-LSCP10-FNS:CH1:VAL_GET",
"SATES30-LSCP10-FNS:CH4:VAL_GET" "SATES30-LSCP10-FNS:CH4:VAL_GET",
# "SATES30-LSCP10-FNS:CH0:WFM"
] ]
pvs = [ pvs = [
"SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG" "SATFE10-PEPG046:PHOTON-ENERGY-PER-PULSE-AVG",
"SATES30-RETRO:MOT_RY.RVB",
"SATES30-RETRO:MOT_Y.RVB"
] ]
live_channels = [ live_channels = [
"SATES30-LSCP10-FNS:CH0:VAL_GET", "SATES30-LSCP10-FNS:CH0:VAL_GET",
"SATES30-LSCP10-FNS:CH1:VAL_GET", "SATES30-LSCP10-FNS:CH1:VAL_GET",
# "SATES30-LSCP10-FNS:CH0:WFM"
# "SATES30-LSCP10-FNS:CH4:VAL_GET" # "SATES30-LSCP10-FNS:CH4:VAL_GET"
] ]

7
undulator.py
View File

@ -64,9 +64,10 @@ class Undulators(Adjustable):
t = a.set_target_value(k_new, hold=False) t = a.set_target_value(k_new, hold=False)
tasks.append(t) tasks.append(t)
wait_for_all(tasks) wait_for_all(tasks)
print("CHIC adjustment follows") print("CHIC adjustment is automatic")
self.chic.set_target_value(value, hold=False) #TODO: test whether an additional sleep is needed sleep(10)
print("CHIC adjustment done") #self.chic.set_target_value(value, hold=False) #TODO: test whether an additional sleep is needed
#print("CHIC adjustment done")
return self._as_task(change, hold=hold) return self._as_task(change, hold=hold)