From f574a21648d63cf7c1462528a755d64bac9fe2de Mon Sep 17 00:00:00 2001
From: gac-x03da <gac-x03da@x03da-cons-1.psi.ch>
Date: Tue, 9 Jun 2020 10:15:28 +0200
Subject: [PATCH] Startup

---
 config/config.properties    |  4 ++--
 config/settings.properties  | 10 +++++-----
 config/variables.properties |  4 ++--
 plugins/Experiment.java     |  4 ++--
 script/XPSSpectrum.py       |  1 +
 script/local.py             |  2 +-
 6 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/config/config.properties b/config/config.properties
index 1641786d..f8af624a 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,4 +1,4 @@
-#Tue May 19 19:37:08 CEST 2020
+#Mon Jun 08 17:32:02 CEST 2020
 hostName=x03da-cons-1
 userManagement=false
 instanceName=x03da
@@ -8,7 +8,7 @@ dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
-dataPath={data}/{year}/{month}/heydari/pshell-{date}-{time}-{name}
+dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name}
 serverEnabled=false
 commandExecutionEvents=false
 logDaysToLive=50
diff --git a/config/settings.properties b/config/settings.properties
index 99245c8e..151b78c3 100644
--- a/config/settings.properties
+++ b/config/settings.properties
@@ -1,7 +1,7 @@
-#Tue May 19 19:37:08 CEST 2020
-pgroup=pp18171
-proposal=20190988
-proposer=heydari
+#Tue Jun 09 09:36:20 CEST 2020
+pgroup=p17274
+proposal=
+proposer=bl-dev
 prefix=
-samples=DPDI/Bi/Cu
+sample=Au poly
 authors=
diff --git a/config/variables.properties b/config/variables.properties
index 4e7c94e7..c66f015c 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,2 @@
-#Mon Jun 08 17:14:45 CEST 2020
-FileSequentialNumber=3559
+#Tue Jun 09 10:04:20 CEST 2020
+FileSequentialNumber=3565
diff --git a/plugins/Experiment.java b/plugins/Experiment.java
index bf103010..b6c6fb1b 100644
--- a/plugins/Experiment.java
+++ b/plugins/Experiment.java
@@ -43,7 +43,7 @@ public class Experiment extends Panel {
             textPGroup.setText(getContext().getSetting("pgroup") == null ? "" : getContext().getSetting("pgroup"));
             textProposal.setText(getContext().getSetting("proposal") == null ? "" : getContext().getSetting("proposal"));
             textProposer.setText(getContext().getSetting("proposer") == null ? "" : getContext().getSetting("proposer"));
-            textSamples.setText(getContext().getSetting("samples") == null ? "" : getContext().getSetting("samples"));
+            textSamples.setText(getContext().getSetting("sample") == null ? "" : getContext().getSetting("sample"));
             textAuthors.setText(getContext().getSetting("authors") == null ? "" : getContext().getSetting("authors").replace("|", "\n"));
             textPrefix.setText(getContext().getSetting("prefix") == null ? "" : getContext().getSetting("prefix"));
         } catch (Exception ex) {
@@ -65,7 +65,7 @@ public class Experiment extends Panel {
             getContext().setSetting("pgroup", pgroup);
             getContext().setSetting("proposal", proposal);
             getContext().setSetting("proposer", proposer);
-            getContext().setSetting("samples", samples);
+            getContext().setSetting("sample", samples);
             getContext().setSetting("authors", authors);
             getContext().setSetting("prefix", prefix);
                                                
diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py
index 2c9cbfa8..1e4f89ec 100644
--- a/script/XPSSpectrum.py
+++ b/script/XPSSpectrum.py
@@ -24,6 +24,7 @@ for cur_range in range(len(ranges)):
     adjusted_ranges.append(ar)
 
 set_exec_pars(open = True)
+create_metadata_datasets()
 
 #Global arguments
 Scienta.passEnergy = pass_energy
diff --git a/script/local.py b/script/local.py
index 1861b71b..06e138a7 100644
--- a/script/local.py
+++ b/script/local.py
@@ -288,7 +288,7 @@ def create_metadata_datasets(parent = None):
     if parent is None: 
         parent = "/"
     group = parent + "general/"
-    for name in ["proposer", "proposal", "pgroup", "samples"]:
+    for name in ["proposer", "proposal", "pgroup", "sample"]:
         setting = get_setting(name)
         save_dataset(group+name, setting if setting is not None else "", 's')
     setting = get_setting("authors")