diff --git a/script/local.py b/script/local.py index 07362f2..265db15 100644 --- a/script/local.py +++ b/script/local.py @@ -1,7 +1,8 @@ ################################################################################################### # Deployment specific global definitions - executed after startup.py ################################################################################################### - + import ch.psi.pshell.device.Stoppable as Stoppable + class PicoAmp(DeviceBase, Stoppable): def __init__(self, name, prefix): DeviceBase.__init__(self, name) @@ -20,7 +21,7 @@ class PicoAmp(DeviceBase, Stoppable): self.ts_net2 = create_channel_device(prefix+"Current2:TSNet", type='[d', size=None, deviceName=name + " Cur2 TSNet") self.ts_min2 = create_channel_device(prefix+"Current2:TSMinValue", type='[d', size=None, deviceName=name + " Cur2 TSMin") self.ts_max2 = create_channel_device(prefix+"Current2:TSMaxValue", type='[d', size=None, deviceName=name + " Cur2 TSMax") - self.ts_minx2 = stopcreate_channel_device(prefix+"Current2:TSMinX", type='[d', size=None, deviceName=name + " Cur2 TSMaxX") + self.ts_minx2 = create_channel_device(prefix+"Current2:TSMinX", type='[d', size=None, deviceName=name + " Cur2 TSMaxX") self.ts_maxx2 = create_channel_device(prefix+"Current2:TSMeanValue", type='[d', size=None, deviceName=name + " Cur2 TSMean") self.ts_sigma2 = create_channel_device(prefix+"Current2:TSSigma", type='[d', size=None, deviceName=name + " Cur2 TSSigma") @@ -52,7 +53,7 @@ class PicoAmp(DeviceBase, Stoppable): ]) def start(self): stop() - caput(self.prefix + "Acquire", "Start") + caput(self.prefix + "Acquire", "Acquire") caput(self.prefix + "Current1:TSControl", "Erase/Start") caput(self.prefix + "Current2:TSControl", "Erase/Start") caput(self.prefix + "Current3:TSControl", "Erase/Start")