From 465f8ca87845084f0f8208844e191a34868e56b9 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 10 Mar 2020 12:39:29 +0100 Subject: [PATCH] Script execution --- script/test/DemoCscanPseudo3.py | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/script/test/DemoCscanPseudo3.py b/script/test/DemoCscanPseudo3.py index 70b4b4ca..3cb2bf30 100644 --- a/script/test/DemoCscanPseudo3.py +++ b/script/test/DemoCscanPseudo3.py @@ -1,10 +1,11 @@ import ch.psi.pshell.device.PositionerConfig as PositionerConfig -import ch.psi.pshell.device.Speedable as Speedable +import ch.psi.pshell.device.ControlledSpeedable as ControlledSpeedable -class PseudoMotor(PositionerBase, Speedable): +class PseudoMotor(PositionerBase, ControlledSpeedable): def __init__(self, name): PositionerBase.__init__(self, name, PositionerConfig()) + self.velocity = self.getDefaultSpeed() self.rbck = 0.0 self.setp = 0.0 self.settime = time.time() @@ -25,11 +26,24 @@ class PseudoMotor(PositionerBase, Speedable): return self.rbck def getSpeed(self): - return 3.0 + return self.velocity + + def setSpeed(self, speed): + self.velocity=speed + + def getDefaultSpeed(self): + return 1.0 + + def getMinSpeed(self): + return 0.1 + + def getMaxSpeed(self): + return 10.0 + positioner = PseudoMotor("PseudoMotor") add_device(positioner, True); show_panel(PseudoMotor) -cscan(positioner, MachineCurrent, 0, 10, 1.0) +cscan(positioner, MachineCurrent, 0, 10, 1.0, time=5.0)