From f7e83bd7341c416cedad57f995efce8a743f73d3 Mon Sep 17 00:00:00 2001
From: gac-x07ma <gac-x07ma@x07ma-cons-1.psi.ch>
Date: Tue, 18 Feb 2020 13:55:31 +0100
Subject: [PATCH] Startup

---
 config/config.properties    | 26 +++++++++++++-------------
 config/variables.properties |  4 ++--
 script/HystScan.py          |  2 +-
 script/local.py             |  2 +-
 4 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/config/config.properties b/config/config.properties
index 3e5a576..47e2e15 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,18 +1,25 @@
-#Thu Nov 07 15:03:54 CET 2019
-hostName=null
-userManagement=false
+#Tue Feb 18 13:54:59 CET 2020
 imageSourcesFile={config}/imaging.properties
-instanceName=
 autoSaveScanData=true
 simulation=false
+commandExecutionEvents=false
+logDaysToLive=50
+userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
+logLevelConsole=Off
+scanStreamerPort=-1
+parallelInitialization=false
+scanStreamingPort=-1
+devicePoolFile={config}/devices.properties
+versionTrackingManual=false
+hostName=null
+userManagement=false
+instanceName=
 dataServerPort=-1
 hideServerMessages=false
 serverPort=8080
 versionTrackingEnabled=true
 dataPath={data}/{year}_{month}/{date}
 serverEnabled=false
-commandExecutionEvents=false
-logDaysToLive=50
 dataScanReleaseRecords=false
 depthDimension=0
 dataScanPreserveTypes=false
@@ -23,18 +30,11 @@ dataLayout=ch.psi.fda.LayoutFDA
 deviceUpdateStrategyFile={config}/update.properties
 terminalEnabled=true
 notificationLevel=null
-userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
-logLevelConsole=Off
 terminalPort=3579
 tasksFile={config}/tasks.properties
-scanStreamerPort=-1
-parallelInitialization=false
 createSessionFiles=false
-scanStreamingPort=-1
 versionTrackingLogin={context}/svcusr-hlapp_robot
-devicePoolFile={config}/devices.properties
 scriptType=py
-versionTrackingManual=true
 versionTrackingRemote=git@git.psi.ch\:pshell_config/x07ma.git
 dataProvider=ch.psi.fda.ProviderFDA
 saveCommandStatistics=false
diff --git a/config/variables.properties b/config/variables.properties
index af6c1b6..556ae38 100644
--- a/config/variables.properties
+++ b/config/variables.properties
@@ -1,2 +1,2 @@
-#Tue Feb 18 13:31:48 CET 2020
-FileSequentialNumber=2114
+#Tue Feb 18 13:53:05 CET 2020
+FileSequentialNumber=2115
diff --git a/script/HystScan.py b/script/HystScan.py
index 0d33c2f..b88ff27 100644
--- a/script/HystScan.py
+++ b/script/HystScan.py
@@ -40,7 +40,7 @@ caputq('X07MA-PC:CSCALER.INPB', '1')
 # open shutter
 caput('X07MA-FE-PH1:CLOSE4BL',1) 
 cawait('X07MA-FE-PH1:MS2', 1)
-
+print "OK"
 
 #if RAMP_RATE is not None:
 #    ramp_rate.write(RAMP_RATE)
diff --git a/script/local.py b/script/local.py
index b79f235..9384911 100644
--- a/script/local.py
+++ b/script/local.py
@@ -10,7 +10,7 @@ import ch.psi.pshell.epics.ChannelSettlingCondition as ChannelSettlingCondition
 
 WAIT_STABLE_TEMPERATURE = True    # True : before energy scan and hyst scan the routine wait_temp() is launched
 NO_BEAM_CHECK = False    # setting this to true disables the waiting for the beam before starting energy or hyst scan
-ABORT_ON_ID_ERROR = True
+ABORT_ON_ID_ERROR = False
 
 _SAMPLE_NAME = "DUMMY"