From 0c39d78c44af281b773fb5dc5a7361a3a7ad1514 Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-02.psi.ch>
Date: Thu, 4 Nov 2021 21:49:21 +0100
Subject: [PATCH] Startup

---
 config/config.properties            |  4 ++--
 config/settings.properties          | 12 ++++++------
 config/variables.properties         |  8 ++++----
 script/QueuedHoloScan.py            | 25 +++++++++++--------------
 script/users/heinrich/GeMnTeXPD.que |  1 +
 5 files changed, 24 insertions(+), 26 deletions(-)
 create mode 100644 script/users/heinrich/GeMnTeXPD.que

diff --git a/config/config.properties b/config/config.properties
index 8f76a7c9..d4e3ce9c 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,4 +1,4 @@
-#Tue Oct 26 09:42:02 CEST 2021
+#Thu Nov 04 15:46:06 CET 2021
 autoSaveScanData=true
 simulation=false
 commandExecutionEvents=false
@@ -26,7 +26,7 @@ dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
-dataPath={data}/{year}/{month}/greber/pshell-{date}-{time}-{name}
+dataPath={data}/{year}/{month}/chen/pshell-{date}-{time}-{name}
 serverEnabled=false
 dataScanReleaseRecords=true
 depthDimension=2
diff --git a/config/settings.properties b/config/settings.properties
index 647f3522..e3010f9a 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,7 +1,7 @@
-#Sun Oct 24 18:28:56 CEST 2021
-pgroup=p19479
-proposal=20210264
-proposer=greber
+#Thu Nov 04 15:46:06 CET 2021
+pgroup=p18329
+proposal=20191502
+proposer=chen
 prefix=
-sample=Sample26_g_290nm SiO2_Si after annealing
-authors=weichuang
+sample=
+authors=
diff --git a/config/variables.properties b/config/variables.properties
index 2595cb88..c2c90771 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,4 +1,4 @@
-#Mon Oct 25 22:36:29 CEST 2021
-LastRunDate=211025
-FileSequentialNumber=9703
-DaySequentialNumber=89
+#Thu Nov 04 21:07:42 CET 2021
+LastRunDate=211104
+FileSequentialNumber=9823
+DaySequentialNumber=5
diff --git a/script/QueuedHoloScan.py b/script/QueuedHoloScan.py
index 862fa68d..7e43e117 100644
--- a/script/QueuedHoloScan.py
+++ b/script/QueuedHoloScan.py
@@ -7,21 +7,18 @@ phi_range: (tuple (min, max)) defaults to hard-coded PHI_RANGE
 theta_range: (tuple (min, max)) defaults to hard-coded THETA_RANGE
 steps: (tuple (phi, theta)) defaults to hard-coded STEPS
 
-region: (dict)
-  optional items can be left unspecified and will default to the indicated values.
-  for swept mode, include 'elo', 'ehi', 'estep', 'iter' values, but do not include 'efix'.
-  for fixed mode, include 'efix' value, but do not include 'elo', 'ehi', 'estep', 'iter'.
+  for swept mode, include 'elo', 'ehi', 'estep', 'iterations' values, but do not include 'efix'.
+  for fixed mode, include 'efix' value, but do not include 'elo', 'ehi', 'estep', 'iterations'.
 
-  'name': user-specific name of the region
-  'elo': lower kinetic energy boundary of the spectrum
-  'ehi': upper kinetic energy boundary of the spectrum
-  'estep': energy step size
-  'efix': center kinetic energy in fixed mode
-  'epass': pass energy
-  'ephot': photon energy (default: unchanged)
-  'tstep': dwell time in seconds
-  'iter': number of iterations/sweeps (default 1)
-  'slit': exit slit (default: unchanged)
+  elo: lower kinetic energy boundary of the spectrum
+  ehi: upper kinetic energy boundary of the spectrum
+  estep: energy step size
+  efix: center kinetic energy in fixed mode
+  epass: pass energy
+  ephot: photon energy (default: unchanged)
+  tstep: dwell time in seconds
+  iterations: number of iterations/sweeps (default 1)
+  slit: exit slit (default: unchanged)
 
 motors: (sequence, optional) position devices
 sensors: (sequence, optional) sensor devices
diff --git a/script/users/heinrich/GeMnTeXPD.que b/script/users/heinrich/GeMnTeXPD.que
new file mode 100644
index 00000000..9abc9298
--- /dev/null
+++ b/script/users/heinrich/GeMnTeXPD.que
@@ -0,0 +1 @@
+[ [ [ true, "QueuedHoloScan.py", "\"efix\":406.25, \"epass\":50, \"tstep\":1.0", "Resume", "Aborted" ], [ true, "QueuedHoloScan.py", "\"efix\":520, \"epass\":50, \"tstep\":1.0", "Resume", "" ] ] ]
\ No newline at end of file