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

added some workarounds

Browse Source
This commit is contained in:
gac-maloja
2022-10-12 20:32:16 +02:00
parent dff3cc35a5
commit 75b1b45a40
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
phases/full_polarization.py
View File

@ -50,8 +50,9 @@ class UndPhases(Adjustable):
def set_target_value(self, value): def set_target_value(self, value):
tasks = [p.set_target_value(value) for p in self.phases] tasks = [p.set_target_value(value) for p in self.phases]
for t in tasks: for t, p in zip(tasks, self.phases):
t.wait() t.wait()
print("done:", p.name)
def is_moving(self): def is_moving(self):
@ -91,6 +92,9 @@ class UndPhase(Adjustable):
radial = antiparallel2gap(k, phase, self.params) radial = antiparallel2gap(k, phase, self.params)
radial = round(radial, 4) #TODO: why? radial = round(radial, 4) #TODO: why?
# workaround for safety measure
if self.radial.get_current_value() <= 5.1:
self.radial.set_target_value(5.1).wait()
self.shift.set_target_value(shift).wait() self.shift.set_target_value(shift).wait()
self.radial.set_target_value(radial).wait() self.radial.set_target_value(radial).wait()
@ -116,6 +120,8 @@ class UndShiftRadialBase(PVAdjustable): #TODO: better name?
lambda: f(value) lambda: f(value)
) )
t.start() t.start()
for i in range(2): #TODO: replace by active wait
sleep(i * 10)
sleep(0.3) sleep(0.3)
self.pv_on.put(1) self.pv_on.put(1)
sleep(0.3) sleep(0.3)
@ -175,6 +181,8 @@ class UndShiftQuadrants(Adjustable):
vals = (value, -value, 0, 0) vals = (value, -value, 0, 0)
tasks = [self.adjs.__dict__[n].set_target_value(v) for n, v in zip(names, vals)] tasks = [self.adjs.__dict__[n].set_target_value(v) for n, v in zip(names, vals)]
for i in range(2): #TODO: replace by active wait
sleep(i * 10)
sleep(0.3) sleep(0.3)
self.pv_on.put(1) self.pv_on.put(1)
sleep(0.3) sleep(0.3)
@ -221,7 +229,7 @@ if __name__ == "__main__":
print(dirname(__file__)) print(dirname(__file__))
basedir = dirname(__file__) basedir = dirname(__file__)
#phase = 123 #phase = 123
phase = 90 phase = 80
check_phase(phase) check_phase(phase)
und_first = 10 und_first = 10
und_last = 22 und_last = 22
@ -260,7 +268,8 @@ if __name__ == "__main__":
ups = UndPhases("SATUN-PHASES", params, isparallel=False) ups = UndPhases("SATUN-PHASES", params, isparallel=False)
sleep(0.3) sleep(0.3)
print(ups.phases[0], ups.phases[0].shift) print(ups.phases[0], ups.phases[0].shift)
ups.phases[0].set_target_value(phase).wait() # ups.phases[0].set_target_value(phase).wait()
ups.set_target_value(phase).wait()
print(ups.phases[0], ups.phases[0].shift) print(ups.phases[0], ups.phases[0].shift)