Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 2fd783ad54 |
@@ -342,7 +342,7 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
|
|||||||
status = CompareStatus(self.calculator.calc_done, 1)
|
status = CompareStatus(self.calculator.calc_done, 1)
|
||||||
self.cancel_on_stop(status)
|
self.cancel_on_stop(status)
|
||||||
status.wait(self.timeout_for_pvwait)
|
status.wait(self.timeout_for_pvwait)
|
||||||
time.sleep(0.25) #TODO needed still? Needed due to update frequency of softIOC
|
time.sleep(0.15)
|
||||||
if mode == "AngleToEnergy":
|
if mode == "AngleToEnergy":
|
||||||
return self.calculator.calc_energy.get()
|
return self.calculator.calc_energy.get()
|
||||||
elif mode == "EnergyToAngle":
|
elif mode == "EnergyToAngle":
|
||||||
@@ -364,6 +364,7 @@ class Mo1Bragg(PSIDeviceBase, Mo1BraggPositioner):
|
|||||||
# Angle and Energy are inverse proportional!
|
# Angle and Energy are inverse proportional!
|
||||||
high_deg = self.convert_angle_energy(mode="EnergyToAngle", inp=low)
|
high_deg = self.convert_angle_energy(mode="EnergyToAngle", inp=low)
|
||||||
low_deg = self.convert_angle_energy(mode="EnergyToAngle", inp=high)
|
low_deg = self.convert_angle_energy(mode="EnergyToAngle", inp=high)
|
||||||
|
p_kink = 100 - p_kink
|
||||||
|
|
||||||
pos, vel, dt = compute_spline(
|
pos, vel, dt = compute_spline(
|
||||||
low_deg=low_deg,
|
low_deg=low_deg,
|
||||||
|
|||||||
Reference in New Issue
Block a user