From 610ab473b739ec97e1f902d41df7f649a1edd2f2 Mon Sep 17 00:00:00 2001
From: x03daop <x03daop@x03da-cons-1.psi.ch>
Date: Tue, 14 Jun 2016 15:09:24 +0200
Subject: [PATCH] Closedown

---
 script/PhotonEnergy.py | 4 ++--
 script/XPSSpectrum.py  | 1 +
 script/local.py        | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/script/PhotonEnergy.py b/script/PhotonEnergy.py
index 441f5b73..16a48c94 100644
--- a/script/PhotonEnergy.py
+++ b/script/PhotonEnergy.py
@@ -13,8 +13,6 @@ if MODE == "swept":
     Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept)
 else:
     Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed)
-adjust_sensors()
-set_adc_averaging()
 
 if len(VECTOR[0]) == 2:
     #FIXED
@@ -26,6 +24,8 @@ else:
     Scienta.highEnergy.write(VECTOR[0][2])
     writables = (Eph, Scienta.lowEnergy, Scienta.highEnergy)
 
+adjust_sensors()
+set_adc_averaging()
 set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
 
 try:
diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py
index 4a6bfe0a..425f3210 100644
--- a/script/XPSSpectrum.py
+++ b/script/XPSSpectrum.py
@@ -63,6 +63,7 @@ try:
                 wait_beam()
                 trig_scienta()
                 spectrum_array = Scienta.spectrum.read()                
+                spectrum_array[0]=10
                 if beam_ok:
                     break
             if ydata is None:
diff --git a/script/local.py b/script/local.py
index 3f6fef83..9a4b42ee 100644
--- a/script/local.py
+++ b/script/local.py
@@ -252,7 +252,9 @@ def set_adc_averaging():
     AuxCurrentAveraging.write(value)
     AuxVoltageAveraging.write(value)
 
-def adjust_sensors():
+def adjust_sensors():    
+    #Updating ranges from Scienta
+    Scienta.update()    
     global SENSORS
     if SENSORS is not None:
         # Move integration to end