From 9f46d554d2915fbef12fe63e157bfcde1850106c Mon Sep 17 00:00:00 2001
From: gac-x04sa <gac-x04sa@x04sa-cons-8.psi.ch>
Date: Fri, 20 Sep 2019 17:14:15 +0200
Subject: [PATCH] Startup

---
 config/settings.properties |  8 ++++----
 config/setup.properties    | 25 +++++++++++++------------
 2 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/config/settings.properties b/config/settings.properties
index a1aa470..b5d55c5 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,9 +1,9 @@
-#Thu Aug 22 16:09:46 CEST 2019
+#Fri Sep 20 17:14:04 CEST 2019
 count_time=1
 data_root=/sls/X04SA/data/x04sa/ES3/expdata
+user_path=../../expdata/pshell_development
+user_name=pshell_development
 detectors=mythen,mythen.acquire_time,pixel,pixel.image_filename,image.intensity,image.corrected_intensity,image.matrix
 geometry=fourcvi
-roi=173 88 285 136
 user_exp=NNO
-user_name=pshell_development
-user_path=../../expdata/pshell_development
+roi=173 88 285 136
diff --git a/config/setup.properties b/config/setup.properties
index b62638a..1ffb543 100644
--- a/config/setup.properties
+++ b/config/setup.properties
@@ -1,19 +1,20 @@
-#Thu Jan 24 09:22:45 CET 2019
-configFile={config}/config.properties
+#Fri Sep 20 17:13:46 CEST 2019
+scriptPath={home}/script
+sessionsPath={outp}/sessions
+pluginsPath={home}/plugins
 configFileDevices={config}/devices.properties
+libraryPath={script}; {script}/Lib
 configFilePlugins={config}/plugins.properties
-configFileSettings={config}/settings.properties
-configFileTasks={config}/tasks.properties
-configPath={home}/config
 contextPath={outp}/context
+extensionsPath={home}/extensions
+configPath={home}/config
 dataPath={outp}/data
 devicesPath={home}/devices
-extensionsPath={home}/extensions
-imagesPath={outp}/images
-libraryPath={script}; {script}/Lib
+configFileVariables={config}/variables.properties
+configFileSettings={config}/settings.properties
 logPath={outp}/log
-pluginsPath={home}/plugins
-scriptPath={home}/script
-scriptType=py
-sessionsPath={outp}/sessions
 wwwPath={home}/www
+imagesPath={outp}/images
+configFile={config}/config.properties
+scriptType=py
+configFileTasks={config}/tasks.properties