Script execution

script/test/20220201/MultiRegionScan.py

@@ -207,17 +207,18 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
         self.setup()
         print("Acquiring region {0}.".format(self.region['name']))
         trig_scienta()
-        time.sleep(0.5)
+        time.sleep(0.1)
         sp = Scienta.getSpectrum().read()
+        self.read_scales()
         return sp
 
     def getSize(self):
-        nx = Scienta.numChannels.read() # ???
-        # if self.region['fixed']:
-        #     nx = 992 # !!!
-        # else:
-        #     nx = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
-        print("SpectrumReader.getSize = ", nx)
+        # this is called before the scan starts - we have to predict the spectrum size
+        # wrong values don't seem to affect the data files, however
+        if self.region['fixed']:
+            nx = 1066
+        else:
+            nx = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
         return nx
 
 
@@ -227,17 +228,17 @@ class ImageReader(ReadonlyRegisterBase, ReadonlyRegisterMatrix):
         return Scienta.getDataMatrix().read()
 
     def getWidth(self):
-        nx = Scienta.numChannels.read() # ???
-        # if self.region['fixed']:
-        #     nx = Scienta.numChannels.read() # ???
-        # else:
-        #     nx = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
-        print("ImageReader.getWidth = ", nx)
+        # this is called before the scan starts - we have to predict the spectrum size
+        # wrong values don't seem to affect the data files, however
+        if self.region['fixed']:
+            nx = 1066
+        else:
+            nx = int((self.region['ehi'] - self.region['elo']) / self.region['estep']) + 1
         return nx
 
     def getHeight(self):
+        # this is called before the scan starts - the number of slices is an independent parameter
         ny = Scienta.slices.read()
-        print("ImageReader.getHeight = ", ny)
         return ny
 
 def setup_live_plots(regions):