From 9f5d1b1ee3d332db7a40baca30847f3738e91706 Mon Sep 17 00:00:00 2001 From: x03daop Date: Fri, 5 Aug 2016 11:28:25 +0200 Subject: [PATCH] Script execution --- script/SchofieldScan.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index 14df1afa..dc8374d6 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -29,7 +29,7 @@ class SpectrumReader1(SpectrumReader): Scienta.getStepSize().write(0.1) Scienta.getLowEnergy().write(88.0 + self.offset) Scienta.getHighEnergy().write(94.0 + self.offset) - global energy_scale_table + global energy_scale_array energy_scale_array = [Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()] class SpectrumReader2(SpectrumReader): @@ -37,17 +37,17 @@ class SpectrumReader2(SpectrumReader): Scienta.getStepSize().write(0.05) Scienta.getLowEnergy().write(94.0 + self.offset) Scienta.getHighEnergy().write(98.0 + self.offset) - global energy_scale_table + global energy_scale_array 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) + Scienta.getHighEnergy().write(108.0 + self.offset) + global energy_scale_array, energy_scale_table energy_scale_array.append([Scienta.getLowEnergy().take(), Scienta.getHighEnergy().take(), Scienta.getStepSize().take()]) - global energy_scale_table - append_dataset(energy_scale_table,[]) + append_dataset(energy_scale_table,energy_scale_array) class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix):