From a75db1f33613f3fcd3d15d69ef532d17df1a6fd8 Mon Sep 17 00:00:00 2001 From: x03daop Date: Fri, 5 Aug 2016 11:19:19 +0200 Subject: [PATCH] Script execution --- script/SchofieldScan.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index c55825cc..a0a0959f 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -24,28 +24,34 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray): def getSize(self): return len(Scienta.getSpectrumX()) +energy_scale_array = [] class SpectrumReader1(SpectrumReader): def setup(self): + global energy_scale_array Scienta.getStepSize().write(0.1) Scienta.getLowEnergy().write(88.0 + self.offset) Scienta.getHighEnergy().write(94.0 + self.offset) + energy_scale_array = [Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()] class SpectrumReader2(SpectrumReader): def setup(self): Scienta.getStepSize().write(0.05) Scienta.getLowEnergy().write(94.0 + self.offset) Scienta.getHighEnergy().write(98.0 + self.offset) + energy_scale_array.append([Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()]) class SpectrumReader3(SpectrumReader): def setup(self): Scienta.getStepSize().write(0.5) Scienta.getLowEnergy().write(98.0 + self.offset) Scienta.getHighEnergy().write(108.0 + self.offset) + energy_scale_array.append([Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()]) + append_dataset(energy_scale_table,[]) class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix): def doRead(self): - return Scienta.getDataMatrix() + return Scienta.getDataMatrix().read() def getWidth(self): return Scienta.getDataMatrix().getWidth() @@ -53,8 +59,6 @@ class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix): def getHeight(self): return Scienta.getDataMatrix().getHeight() - - reader1 = SpectrumReader1(); reader1.initialize() reader2 = SpectrumReader2(); reader2.initialize() reader3 = SpectrumReader3(); reader3.initialize() @@ -71,7 +75,12 @@ Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept) Scienta.lowEnergy.write(VECTOR[0][1]) Scienta.highEnergy.write(VECTOR[0][2]) -writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy) +writables = (Eph) + +energy_scale_table = get_context().group + "/EnergyScale" + +create_dataset(energy_scale_table, 'd', dimensions=[0,9]) + adjust_sensors() set_adc_averaging()