From 5cec2da7eade76f1a73f229f88a7799520048626 Mon Sep 17 00:00:00 2001
From: x07maop <x07maop@x07ma-cons-1.psi.ch>
Date: Thu, 17 Mar 2016 10:14:44 +0100
Subject: [PATCH] Startup

---
 config/config.properties  |  4 ++--
 config/config.properties~ | 16 ++++++++++------
 script/local.py           | 12 ++++++------
 3 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/config/config.properties b/config/config.properties
index 9979574..dfb0712 100644
--- a/config/config.properties
+++ b/config/config.properties
@@ -1,10 +1,10 @@
-#Thu Mar 10 08:54:13 CET 2016
+#Thu Mar 17 10:00:01 CET 2016
 autoSaveScanData=true
 createSessionFiles=false
+dataLayout=table
 dataPath={data}/{year}_{month}/{date}
 dataProvider=txt
 dataScanFlushRecords=true
-dataScanStrategy=table
 devicePoolFile={config}/devices.properties
 deviceUpdateStrategyFile={config}/update.properties
 imageSourcesFile={config}/imaging.properties
diff --git a/config/config.properties~ b/config/config.properties~
index 82cb45d..7d6f435 100644
--- a/config/config.properties~
+++ b/config/config.properties~
@@ -1,7 +1,8 @@
-#Tue Jul 28 15:18:34 CEST 2015
+#Thu Mar 17 10:00:01 CET 2016
 autoSaveScanData=true
 createSessionFiles=false
-dataPath={data}/{year}_{month}/{date}/{date}_{time}_{context}
+dataLayout=table
+dataPath={data}/{year}_{month}/{date}
 dataProvider=txt
 dataScanFlushRecords=true
 dataScanStrategy=table
@@ -9,8 +10,10 @@ devicePoolFile={config}/devices.properties
 deviceUpdateStrategyFile={config}/update.properties
 imageSourcesFile={config}/imaging.properties
 logDaysToLive=-1
-logLevel=Info
+logLevel=Fine
 logLevelConsole=Off
+logPath={logs}/{date}_{time}
+scanStreamingPort=-1
 scriptType=py
 serverEnabled=false
 serverPort=8080
@@ -18,8 +21,9 @@ simulation=false
 tasksFile={config}/tasks.properties
 terminalEnabled=true
 terminalPort=3579
-userAuthenticator=
+userAuthenticator=ch.psi.pshell.security.LdapAuthenticator | ldap\\\://d.psi.ch | d.psi.ch | users.psi
 userManagement=false
 versionTrackingEnabled=true
-versionTrackingLogin={config}/agkey
-versionTrackingRemote=ssh\://git@github.psi.ch\:7999/psd/x07ma.git
+versionTrackingLogin=
+versionTrackingManual=false
+versionTrackingRemote=https\://git.psi.ch/pshell_config/x07ma.git
diff --git a/script/local.py b/script/local.py
index dc46b5c..00cf814 100644
--- a/script/local.py
+++ b/script/local.py
@@ -8,18 +8,18 @@ energy.setBlockingWrite(True)
 
 
 #The persistence strategy is overriden to adjust file names
-import ch.psi.pshell.data.ScanPersistenceStrategyTable
-class Strategy(ch.psi.pshell.data.ScanPersistenceStrategyTable):
+import ch.psi.pshell.data.LayoutTable
+class DataLayout( ch.psi.pshell.data.LayoutTable):
     def getLogFileName(self):
-        return time.strftime('%Y%m%d%H%M%S') + '_' + controller.getExecutingContext() + '_logs'
+        return time.strftime('%Y%m%d%H%M%S') + '_' + get_context().name + '_logs'
     
     def getDatasetName(self, scan):
         global FILENAME, data_file
-        name = controller.getExecutingContext() if FILENAME is None else FILENAME            
-        data_file =  time.strftime('%Y%m%d_%H%M') + '_' + name  + '_' + str(controller.dataManager.getScanIndex()).zfill(4)        
+        name = get_context().name if FILENAME is None else FILENAME            
+        data_file =  time.strftime('%Y%m%d_%H%M') + '_' + name  + '_' + str(get_context().index).zfill(4)        
         print "Opened data file: " + str(controller.dataManager.output) + "/" + data_file
         return data_file
-controller.dataManager.setScanStrategy(Strategy())
+controller.dataManager.setLayout(DataLayout())
 
 """
 
import ch.psi.pshell.data.LayoutTable