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

made CHIC (theoretically) scanable, i.e., set_target_value returns a Task

Browse Source
This commit is contained in:
augustin_s
2021-06-22 21:22:18 +02:00
parent 6f6c8ee7b4
commit 54804a2eec
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
devices/undulator.py
View File

@ -65,7 +65,7 @@ class Undulators(Adjustable):
tasks.append(t) tasks.append(t)
wait_for_all(tasks) wait_for_all(tasks)
print("Warning: CHIC adjustment is still commented!") print("Warning: CHIC adjustment is still commented!")
# self.chic.set_target_value(value) #TODO: test whether an additional sleep is needed # self.chic.set_target_value(value).wait() #TODO: test whether an additional sleep is needed
return self._as_task(change, hold=hold) return self._as_task(change, hold=hold)
@ -161,10 +161,17 @@ class CHIC(PVAdjustable):
self.pvs.start = PV("SATUN-CHIC:APPLY-DELAY-OFFSET-PHASE") self.pvs.start = PV("SATUN-CHIC:APPLY-DELAY-OFFSET-PHASE")
self.units = units self.units = units
def set_target_value(self, value):
def set_target_value(self, value, hold=False):
value /= 1000 value /= 1000
super().set_target_value(value)
self.pv_start.put(1) def change():
super().set_target_value(value).wait()
self.pvs.start.put(1, wait=True)
#TODO: test whether an additional sleep is needed
return self._as_task(change, hold=hold)
def get_current_value(self): def get_current_value(self):
return super().get_current_value() * 1000 return super().get_current_value() * 1000