From cdb4dec873660fec780ac251aff48d230d064f5b Mon Sep 17 00:00:00 2001 From: x03daop Date: Fri, 5 Aug 2016 11:43:42 +0200 Subject: [PATCH] Script execution --- script/SchofieldScan.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/script/SchofieldScan.py b/script/SchofieldScan.py index 0a041ec2..01a3d804 100644 --- a/script/SchofieldScan.py +++ b/script/SchofieldScan.py @@ -28,6 +28,7 @@ energy_scale_array = [] initial_energy_range = [[88.0, 94.0, 0.1], [94.0, 98.0, 0.05] , [98.0, 108.0, 0.5]] + class SpectrumReader1(SpectrumReader): def setup(self): global energy_scale_array, initial_energy_range @@ -59,7 +60,8 @@ class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix): return Scienta.getDataMatrix().read() def getWidth(self): - return Scienta.getDataMatrix().getWidth() + global initial_energy_range + return initial_energy_range[self.index][1]-initial_energy_range[self.index][0] def getHeight(self): return Scienta.getDataMatrix().getHeight() @@ -68,8 +70,8 @@ reader1 = SpectrumReader1(); reader1.initialize() reader2 = SpectrumReader2(); reader2.initialize() reader3 = SpectrumReader3(); reader3.initialize() image1 = ImageReader(); image1.initialize(); image1.index=0; set_device_alias(image1, "Image1") -image2 = ImageReader(); image2.initialize(); image1.index=1; set_device_alias(image2, "Image2") -image3 = ImageReader(); image3.initialize(); image1.index=2; set_device_alias(image3, "Image3") +image2 = ImageReader(); image2.initialize(); image2.index=1; set_device_alias(image2, "Image2") +image3 = ImageReader(); image3.initialize(); image3.index=2; set_device_alias(image3, "Image3") Scienta.getDataMatrix()