From ebfaaaffcf482b9f8a25e73881a6001dbf791135 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Tue, 9 Jul 2019 18:43:29 +0200
Subject: [PATCH] Script execution

---
 script/MultiRegionScan.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/script/MultiRegionScan.py b/script/MultiRegionScan.py
index fb5c4030..4a7aa2dc 100644
--- a/script/MultiRegionScan.py
+++ b/script/MultiRegionScan.py
@@ -135,20 +135,23 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
             if self.region_index == 0:
                 print "scan {0}".format(self.scan_index)
         
-        try:
-            Eph.move(self.region['ephot'])
-        except KeyError:
-            pass
-            
-        ephot = Eph.take(100)
         edelta = 0.0
+        try:
+            ephot = self.region['ephot']
+            Eph.move(ephot)
+        except KeyError:
+            ephot = Eph.take(100)
+
+        print("done set ephot')
+        
         if isinstance(ephot, float) and ephot > 0.:
             try:
                 if self.region['cis']:
                     edelta = ephot - self.ephot_start
             except AttributeError:
                 self.ephot_start = ephot
-            
+
+        print("done read ephot")
         elo = self.region['elo'] + edelta
         ehi = self.region['ehi'] + edelta
 
@@ -164,27 +167,31 @@ class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
             append_dataset(self.channel_begin_dataset_name, elo)
             append_dataset(self.channel_end_dataset_name, ehi)
             append_dataset(self.step_energy_dataset_name, self.region['estep'])
-        
+        print("done ekin")
         try:
             Scienta.setPassEnergy(int(self.region['epass']))
             append_dataset(self.pass_energy_dataset_name, self.region['epass'])
         except KeyError:
             pass
+        print("done epass")
         try:
             Scienta.stepTime.write(self.region['tstep'])
             append_dataset(self.step_time_dataset_name, self.region['tstep'])
         except KeyError:
             pass
+        print("done tstep")
         try:
             Scienta.setIterations(self.region['iter'])
             append_dataset(self.iterations_dataset_name, self.region['iter'])
         except KeyError:
             pass
+        print("done iter")
         try:
             ExitSlit.move(self.region['slit'])
             append_dataset(self.slit_dataset_name, self.region['slit'])
         except KeyError:
             pass
+        print("done slit")
         Scienta.update()
         
         print("done spectrum.setup")