From d5a9b091d2622ebee1cc37dc300e898b14983feb Mon Sep 17 00:00:00 2001 From: Leonardo Sala Date: Tue, 11 Oct 2016 10:15:28 +0200 Subject: [PATCH] Script execution --- script/local.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/script/local.py b/script/local.py index 9f7dfcb..381351e 100644 --- a/script/local.py +++ b/script/local.py @@ -41,6 +41,13 @@ class PicoAmp(DeviceBase, Stoppable): self.ts_maxx4 = create_channel_device(prefix+"Current4:TSMeanValue", type='[d', size=None, deviceName=name + " Cur4 TSMean") self.ts_sigma4 = create_channel_device(prefix+"Current4:TSSigma", type='[d', size=None, deviceName=name + " Cur4 TSSigma") + + self.ts_posX_sigma = create_channel_device(prefix+"PosXTSSigma", type='[d', size=None, deviceName=name + " PosX TSSigma") + self.ts_posY_sigma = create_channel_device(prefix+"PosYTSSigma", type='[d', size=None, deviceName=name + " PosY TSSigma") + self.ts_posX_total = create_channel_device(prefix+"PosXTSTotal", type='[d', size=None, deviceName=name + " PosX TSTotal") + self.ts_posY_total = create_channel_device(prefix+"PosYTSTotal", type='[d', size=None, deviceName=name + " PosY TSTotal") + + self.setChildren([self.array_data, self.ts_total,self.ts_net, self.ts_min, self.ts_max, self.ts_minx, \ self.ts_maxx, self.ts_sigma, \ self.ts_total2,self.ts_net2, self.ts_min2, self.ts_max2, self.ts_minx2, \ @@ -48,7 +55,8 @@ class PicoAmp(DeviceBase, Stoppable): self.ts_total3,self.ts_net3, self.ts_min3, self.ts_max3, self.ts_minx3, \ self.ts_maxx3, self.ts_sigma3, \ self.ts_total4,self.ts_net4, self.ts_min4, self.ts_max4, self.ts_minx4, \ - self.ts_maxx4, self.ts_sigma4 + self.ts_maxx4, self.ts_sigma4, self.ts_posX_sigma, self.ts_posY_sigma, \ + ]) def start(self): stop() @@ -58,6 +66,9 @@ class PicoAmp(DeviceBase, Stoppable): caputq(self.prefix + "Current2:TSControl", "Erase/Start") caputq(self.prefix + "Current3:TSControl", "Erase/Start") caputq(self.prefix + "Current4:TSControl", "Erase/Start") + caputq(self.prefix + "PositionX:TSControl", "Erase/Start") + caputq(self.prefix + "PositionY:TSControl", "Erase/Start") + def stop(self): caputq(self.prefix + "Acquire", "Stop")