From e0b667c7ce367b0b88562fbf0b07dbbab5e2a244 Mon Sep 17 00:00:00 2001 From: gac-x03da Date: Tue, 12 Oct 2021 15:59:13 +0200 Subject: [PATCH] Closedown --- config/config.properties | 4 ++-- config/settings.properties | 8 ++++---- config/variables.properties | 6 +++--- script/XPSSpectrum.py | 8 ++++++-- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/config/config.properties b/config/config.properties index 3ff41094..3a5994f2 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,4 +1,4 @@ -#Mon Oct 11 20:14:17 CEST 2021 +#Tue Oct 12 15:58:17 CEST 2021 autoSaveScanData=true simulation=false commandExecutionEvents=false @@ -25,7 +25,7 @@ dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true -dataPath={data}/{year}/{month}/heinrich_m/pshell-{date}-{time}-{name} +dataPath={data}/{year}/{month}/bl-dev/pshell-{date}-{time}-{name} serverEnabled=false dataScanReleaseRecords=true depthDimension=2 diff --git a/config/settings.properties b/config/settings.properties index aa4fdd9b..2e64fb35 100644 --- a/config/settings.properties +++ b/config/settings.properties @@ -1,7 +1,7 @@ -#Tue Oct 12 15:33:25 CEST 2021 -pgroup=p19371 +#Tue Oct 12 15:58:17 CEST 2021 +pgroup=p17274 proposal= -proposer=heinrich_m +proposer=bl-dev prefix= sample=no sample -authors=Martin Heinrich +authors= diff --git a/config/variables.properties b/config/variables.properties index 017b97d0..fb290d53 100644 --- a/config/variables.properties +++ b/config/variables.properties @@ -1,4 +1,4 @@ -#Tue Oct 12 15:33:34 CEST 2021 +#Tue Oct 12 15:38:36 CEST 2021 LastRunDate=211012 -FileSequentialNumber=8950 -DaySequentialNumber=1 +FileSequentialNumber=8952 +DaySequentialNumber=3 diff --git a/script/XPSSpectrum.py b/script/XPSSpectrum.py index 5b230aa6..d94831f3 100644 --- a/script/XPSSpectrum.py +++ b/script/XPSSpectrum.py @@ -122,8 +122,12 @@ try: path="scan" + str(cur_range+1) + "/" for cur_iteration in range(vars[2]): print "iteration", cur_iteration - p = plots[cur_range+1] - p.setTitle(str(ranges[cur_range]) + " - iteration " + str(cur_iteration+1)) + try: + p = plots[cur_range+1] + p.setTitle(str(ranges[cur_range]) + " - iteration " + str(cur_iteration+1)) + except IndexError: + pass + while True: wait_beam() trig_scienta()