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

updates

Browse Source
This commit is contained in:
augustin_s
2021-06-27 11:10:06 +02:00
parent 0d69d2634d
commit 44c5dd1308
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
devices/undulator.py
View File

@ -8,9 +8,7 @@ from slic.core.scanner.scanbackend import wait_for_all #, stop_all
# 14 is the CHIC # 14 is the CHIC
n_unds = [ n_unds = [6, 7, 8, 9, 10, 11, 12, 13,
#6, 7, 8, 9, 10, 11, 12,
13,
15, 16, 17, 18, 19, 20, 21, 22 15, 16, 17, 18, 19, 20, 21, 22
] ]
@ -65,8 +63,9 @@ 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("Warning: CHIC adjustment is still commented!") print("CHIC adjustment follows")
# self.chic.set_target_value(value, hold=False).wait() #TODO: test whether an additional sleep is needed 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) return self._as_task(change, hold=hold)
@ -164,12 +163,19 @@ class CHIC(PVAdjustable):
def set_target_value(self, value, hold=False): def set_target_value(self, value, hold=False):
fudge_offset = 3
print("CHIC fudge offset is", fudge_offset)
value -= fudge_offset
value /= 1000 value /= 1000
def change(): def change():
super().set_target_value(value, hold=False).wait() sleep(1)
print("CHIC setvalue")
self.pvs.setvalue.put(value, wait=True)
print("CHIC start")
self.pvs.start.put(1, wait=True) self.pvs.start.put(1, wait=True)
#TODO: test whether an additional sleep is needed #TODO: test whether an additional sleep is needed
sleep(1)
return self._as_task(change, hold=hold) return self._as_task(change, hold=hold)