From 398cf83cfe08b7ac2c319188152155068e416cab Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Fri, 8 Nov 2019 18:28:38 +0100
Subject: [PATCH] Script execution

---
 script/users/Niels/NielsNachtschicht.py | 32 ++++++++++++++++++++-----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/script/users/Niels/NielsNachtschicht.py b/script/users/Niels/NielsNachtschicht.py
index 159f07b5..ac335929 100644
--- a/script/users/Niels/NielsNachtschicht.py
+++ b/script/users/Niels/NielsNachtschicht.py
@@ -1,10 +1,30 @@
 import ch.psi.pshell.plot.RangeSelectionPlot.RangeSelection as RangeSelection
 
-rs = RangeSelection(300.0,400.0)
-rs.setVars([0.1, 0.2, 1, 800.]) #Time, Size, Itaration
 
-run("XPSSpectrum", {"save_scienta_image":True, 
-                    "ranges":[rs, ], 
-                    "ENDSCAN":False, 
-                    "pass_energy":50})
+SENSORS = (Counts, Scienta.dataMatrix, SampleCurrent, RefCurrent, MachineCurrent)
+PHI_RANGE = (-60., 60.)
+THETA_RANGE = (-9., 71)
+STEPS = (60, 40)
+LATENCY = False
+RELATIVE = False
+ZIGZAG = True
+
+Eph.move(801.)
+Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Fixed)
+Scienta.centerEnergy.write(353.)
+# Scienta.setAcquisitionMode(ch.psi.pshell.epics.Scienta.AcquisitionMode.Swept)
+#Scienta.lowEnergy.write(100.)
+#Scienta.highEnergy.write(120.)
+#Scienta.stepSize.write(0.1)
+Scienta.setPassEnergy(50)
+Scienta.stepTime.write(1)
+Scienta.setIterations(1)
+ExitSlit.write(51.)
+Scienta.update()
+
+adjust_sensors()
+set_adc_averaging()
+set_preference(Preference.PLOT_TYPES, {'Scienta spectrum':1})
+ascan((ManipulatorPhi, ManipulatorTheta), SENSORS, (PHI_RANGE[0], THETA_RANGE[0]), (PHI_RANGE[1], THETA_RANGE[1]), STEPS, LATENCY, RELATIVE, zigzag = ZIGZAG, \
+          before_read=before_readout, after_read = after_readout, compression = True)