From 0a673f6e2588b84e33bcf638fb8c49dd06eecb8c Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Sat, 23 Nov 2019 18:36:33 +0100
Subject: [PATCH] Closedown

---
 config/variables.properties                    |  4 ++--
 script/191121-ActualOvernight.py               |  5 ++++-
 script/test_movement.py                        | 10 ++++++++++
 script/users/Niels/20191120-MultiRegionScan.py |  2 ++
 script/users/Niels/MultiRegionScan_VB.py       |  4 ++--
 5 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/config/variables.properties b/config/variables.properties
index 217efe47..484d4f7e 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,2 @@
-#Wed Nov 20 20:15:40 CET 2019
-FileSequentialNumber=996
+#Sat Nov 23 18:10:59 CET 2019
+FileSequentialNumber=1222
diff --git a/script/191121-ActualOvernight.py b/script/191121-ActualOvernight.py
index a838e25d..347fc7ff 100644
--- a/script/191121-ActualOvernight.py
+++ b/script/191121-ActualOvernight.py
@@ -16,14 +16,17 @@ move_to_position(REFERENCE_POSITION)
 rs = RangeSelection(347.0,354.0)
 rs.setVars([1., 1., 1, 800.]) #Time, Size, Iteration, photon energy
 
+set_exec_pars(name="Scan1")                    
+
 run("XPSSpectrum", {"save_scienta_image":True, 
                     "ranges":[rs, ], 
                     "ENDSCAN":False, 
                     "pass_energy":100})
 
 set_exec_pars(open=False)                    
+set_exec_pars(name="Scan2")                    
 
-flush_data()
+#flush_data()
 
 #In600
 move_to_position(SAMPLE_POSITION)
diff --git a/script/test_movement.py b/script/test_movement.py
index d1f31f93..b26bbc13 100644
--- a/script/test_movement.py
+++ b/script/test_movement.py
@@ -23,3 +23,13 @@ dosing = PhysicalLocation(-4.1,-0.5,115.1,51.0,0.7,-90.0)
 
 sample.move_to_location()
 
+energies = [300,400,500]
+
+for e in energies:
+
+    goldReference.move_to_location()
+    thisregion = {'name': 'Au', 'ephot': 1237.7, 'efix': 1222.1, 'epass': 50., 'tstep': 5., 'iter': 1, 'cis': False}
+
+
+    sample.move_to_location()
+    thisregion = {'name': 'In3d', 'ephot': 1237.7, 'efix': 1222.1, 'epass': 50., 'tstep': 5., 'iter': 1, 'cis': False}
\ No newline at end of file
diff --git a/script/users/Niels/20191120-MultiRegionScan.py b/script/users/Niels/20191120-MultiRegionScan.py
index 90023c11..0e74f1e0 100644
--- a/script/users/Niels/20191120-MultiRegionScan.py
+++ b/script/users/Niels/20191120-MultiRegionScan.py
@@ -96,6 +96,8 @@ def check_region(region):
     if 'cis' not in region:
         region['cis'] = False
         print("region {0}: setting default cis = {1}".format(region['name'], region['cis']))
+
+MonoGrating.
         
 class SpectrumReader(ReadonlyRegisterBase, ReadonlyRegisterArray):
     def initialize(self):
diff --git a/script/users/Niels/MultiRegionScan_VB.py b/script/users/Niels/MultiRegionScan_VB.py
index 9c68eafc..e0a31a03 100644
--- a/script/users/Niels/MultiRegionScan_VB.py
+++ b/script/users/Niels/MultiRegionScan_VB.py
@@ -47,12 +47,12 @@ REG1 = {'name': 'VB1', 'elo': 104.3, 'ehi': 105.5, 'estep': 0.005, 'epass': 10.,
 #REG2 = {'name': 'VB2', 'elo': 104.3, 'ehi': 105.5, 'estep': 0.005, 'epass': 10., 'tstep': 0.25, 'iter': 1, 'cis': False}
 
 def indexed_dict(index):
-    return {'name': 'VB'+str(index), 'elo': 104.3, 'ehi': 105.5, 'estep': 0.005, 'epass': 10., 'tstep': 0.1, 'iter': 1, 'cis': False}
+    return {'name': 'VB'+str(index), 'elo': 104.3, 'ehi': 105.6, 'estep': 0.005, 'epass': 10., 'tstep': 0.5, 'iter': 1, 'cis': False}
 
 # list of region dictionaries to execute at each scan position
 #REGIONS = [REG1]
 
-REGIONS = [indexed_dict(i) for i in range(1,3)]
+REGIONS = [indexed_dict(i) for i in range(0,120)]
 
 # close beam shutter and turn off analyser at the end of the scan
 CLOSE_SHUTTER_AT_END = False