Startup

config/config.properties

@@ -1,17 +1,21 @@
-#Wed Jan 20 16:39:29 CET 2016
+#Tue May 03 10:10:39 CEST 2016
 autoSaveScanData=true
 createSessionFiles=false
+dataLayout=default
 dataPath={data}/{year}_{month}/{date}/{date}_{time}_{exec}
 dataProvider=default
 dataScanFlushRecords=true
 dataScanStrategy=default
+dataServerPort=-1
 devicePoolFile={config}/devices.properties
 deviceUpdateStrategyFile={config}/update.properties
 imageSourcesFile={config}/imaging.properties
+instanceName=
 logDaysToLive=-1
 logLevel=Info
 logLevelConsole=Off
 logPath={logs}/{date}_{time}
+scanStreamerPort=-1
 serverEnabled=false
 serverPort=8080
 simulation=false

config/devices.properties

@@ -24,3 +24,4 @@ bm2try=ch.psi.pshell.epics.Motor|X12SA-OP-BM2:TRY1|||true
 bm3trx=ch.psi.pshell.epics.Motor|X12SA-OP-BM3:TRX1|||true
 bm3try=ch.psi.pshell.epics.Motor|X12SA-OP-BM3:TRY1|||true
 sdev1=ch.psi.pshell.serial.SerialPortDevice||||
+scaler=ch.psi.pshell.epics.Scaler|X12SA-ES1-SCALER|||