From 5b0f530af9e1237ff4b9c66da7cde4b2db0da620 Mon Sep 17 00:00:00 2001 From: x03daop Date: Fri, 5 Aug 2016 10:46:36 +0200 Subject: [PATCH] Script execution --- script/SchofieldScan.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index a4f1cbb1..1aba81b0 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -16,8 +16,8 @@ VECTOR = [ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): def doRead(self): global VECTOR - self.offset = Eph.getSetpoint() - VECTOR[0][0] - setup() + self.offset = Eph.getSetpoint().take() - VECTOR[0][0] + self.setup() trig_scienta() return Scienta.getSpectrum().read() @@ -26,25 +26,25 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): class SpectrumReader1(SpectrumReader): def setup(self): - Scienta.getStepSize().write(0.1) - Scienta.getChannelBegin().write(88.0 + self.offset) - Scienta.getChannelEnd().write(94.0 + self.offset) + Scienta.getStepSize().write(0.1) + Scienta.getLowEnergy().write(88.0 + self.offset) + Scienta.getHighEnergy().write(94.0 + self.offset) class SpectrumReader2(SpectrumReader): def setup(self): Scienta.getStepSize().write(0.05) - Scienta.getChannelBegin().write(94.0 + self.offset) - Scienta.getChannelEnd().write(98.0 + self.offset) + Scienta.getLowEnergy().write(94.0 + self.offset) + Scienta.getHighEnergy().write(98.0 + self.offset) class SpectrumReader3(SpectrumReader): def setup(self): Scienta.getStepSize().write(0.5) - Scienta.getChannelBegin().write(98.0 + self.offset) - Scienta.getChannelEnd().write(108.0 + self.offset) + Scienta.getLowEnergy().write(98.0 + self.offset) + Scienta.getHighEnergy().write(108.0 + self.offset) -reader1 = SpectrumReader1() -reader2 = SpectrumReader2() -reader3 = SpectrumReader3() +reader1 = SpectrumReader1(); reader1.initialize() +reader2 = SpectrumReader2(); reader2.initialize() +reader3 = SpectrumReader3(); reader3.initialize() SENSORS = [RefCurrent, reader1,Scienta.getImage(), reader2, Scienta.getImage(), reader3, Scienta.getImage()]