From c4cae0e2d8fed43bef36fb1d38a36ebcd31468c9 Mon Sep 17 00:00:00 2001 From: Leonardo Sala Date: Tue, 11 Oct 2016 09:34:32 +0200 Subject: [PATCH] Closedown --- script/local.py | 7 ++++--- script/scan1.py | 6 +++--- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/script/local.py b/script/local.py index 674493a..77e8536 100644 --- a/script/local.py +++ b/script/local.py @@ -1,7 +1,6 @@ ################################################################################################### # 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): @@ -21,7 +20,9 @@ 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 = create_channel_device(prefix+"Current2:TSMinX", type='[d', size=None, deviceName=name + " Cur2 TSMaxX") + self.ts_minx2 = +#import ch.psi.pshell.devicts_sigmae.Stoppable as Stoppable + 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") @@ -32,7 +33,7 @@ class PicoAmp(DeviceBase, Stoppable): self.ts_max3 = create_channel_device(prefix+"Current3:TSMaxValue", type='[d', size=None, deviceName=name + " Cur3 TSMax") self.ts_minx3 = create_channel_device(prefix+"Current3:TSMinX", type='[d', size=None, deviceName=name + " Cur3 TSMaxX") self.ts_maxx3 = create_channel_device(prefix+"Current3:TSMeanValue", type='[d', size=None, deviceName=name + " Cur3 TSMean") - self.ts_sigma3 = create_channel_device(prefix+"Current3:TSSigma", type='[d', size=None, deviceName=name + " Cur3 TSSigma") + self.ts_sigma3 = crts_sigmaeate_channel_device(prefix+"Current3:TSSigma", type='[d', size=None, deviceName=name + " Cur3 TSSigma") self.ts_total4 = create_channel_device(prefix+"Current4:TSTotal", type='[d', size=None, deviceName=name + " Cur4 TSTotal") self.ts_net4 = create_channel_device(prefix+"Current4:TSNet", type='[d', size=None, deviceName=name + " Cur4 TSNet") diff --git a/script/scan1.py b/script/scan1.py index 592efbc..405c013 100644 --- a/script/scan1.py +++ b/script/scan1.py @@ -3,8 +3,8 @@ pico_amp.start() time.sleep(1.0) readables = pico_amp.getChildren().tolist() #+ pico_amp_2.getChildren().tolist() setup_plotting(line_plots = readables) -pico_amp.waitReady(-1) +#pico_amp.waitReady(-1) -r=tscan(readables, 1, 0) +r=tscan(readables, 3600 , 1.0) -#pico_amp.stop() \ No newline at end of file +pico_amp.stop() \ No newline at end of file