From 7fd30d16adcb1752f5c6bc1f84dceddbc73c60a8 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Fri, 7 Apr 2017 15:25:22 +0200
Subject: [PATCH] Script execution

---
 script/MultiRegionScan2.py | 79 ++++++++++----------------------------
 1 file changed, 21 insertions(+), 58 deletions(-)

diff --git a/script/MultiRegionScan2.py b/script/MultiRegionScan2.py
index cf8c9d19..be6c8dee 100644
--- a/script/MultiRegionScan2.py
+++ b/script/MultiRegionScan2.py
@@ -22,84 +22,47 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
         Scienta.setIterations(self.region['iter'])
 
     def read(self):
-        print "enter SpectrumReader.read"
-        print str(self.region)
+        print "acquiring spectrum {0}-{1} eV".format(self.region['elo'], self.region['ehi'])
         self.setup()
         trig_scienta()
         time.sleep(0.5)
         sp = Scienta.getSpectrum().read()
-        nx = len(sp)
-        print "w = ", nx
         return sp
 
     def getSize(self):
-        print "SpectrumReader.getSize"
-        n1 = Scienta.numChannels.read()
-        n2 = len(Scienta.getSpectrumX())
-        n3 = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
-        print n1, n2, n3
-        return n3
+        nx = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
+        return nx
 
 
 class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix):   
     def read(self):
-        print "ImageReader.read"
-        nx = Scienta.getDataMatrix().getWidth()
-        ny = Scienta.getDataMatrix().getHeight()
-        print "w, h = ", nx, ny
         return Scienta.getDataMatrix().read()
 
     def getWidth(self):
-        print "ImageReader.getWidth"
-        n2 = Scienta.getDataMatrix().getWidth()
-        n3 = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
-        print n2, n3
-        return n3
+        nx = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
+        return nx
 
     def getHeight(self):
-        print "ImageReader.getHeight"
-        n2 = Scienta.getDataMatrix().getHeight()
-        n3 = Scienta.slices.read()
-        print n2, n3
-        return n3
+        ny = Scienta.slices.read()
+        return ny
 
 
-index = 0
-reader1 = SpectrumReader()
-reader1.initialize()
-reader1.index = index
-reader1.region = REGIONS[index]
-set_device_alias(reader1, "ScientaSpectrum1")
+SENSORS = [SampleCurrent, RefCurrent]
 
-image1 = ImageReader()
-image1.initialize()
-image1.index = index
-image1.region = REGIONS[index]
-set_device_alias(image1, "ScientaImage1")
+for (index, region) in enumerate(REGIONS):
+    reader = SpectrumReader()
+    reader.initialize()
+    reader.index = index
+    reader.region = region
+    set_device_alias(reader, "ScientaSpectrum{0}".format(index + 1))
+    SENSORS.append(reader)
 
-index = 1
-reader2 = SpectrumReader()
-reader2.initialize()
-reader2.index = index
-reader2.region = REGIONS[index]
-set_device_alias(reader2, "ScientaSpectrum2")
-
-image2 = ImageReader()
-image2.initialize()
-image2.index = index
-image2.region = REGIONS[index]
-set_device_alias(image2, "ScientaImage2")
-
-#reader3 = SpectrumReader()
-#reader3.initialize()
-#image3 = ImageReader()
-#image3.initialize()
-#image3.index=2
-#set_device_alias(image3, "ScientaImage3")
-
-SENSORS = [SampleCurrent, RefCurrent, reader1, image1, reader2, image2]#, reader3, image3]
-
-Scienta.getDataMatrix()
+    image = ImageReader()
+    image.initialize()
+    image.index = index
+    image.region = region
+    set_device_alias(image, "ScientaImage{0}".format(index + 1))
+    SENSORS.append(image)
 
 adjust_sensors()
 set_adc_averaging()