diff --git a/config/config.properties b/config/config.properties index cc7ece2..cf1768c 100644 --- a/config/config.properties +++ b/config/config.properties @@ -1,9 +1,9 @@ -#Fri Aug 28 10:35:46 CEST 2015 +#Wed Sep 02 09:05:25 CEST 2015 autoSaveScanData=true createSessionFiles=false dataFilesCreation=true dataPath={data}/{year}_{month}/{date}/{date}_{time}_{exec} -dataProvider=text +dataProvider=txt dataScanFlushRecords=false dataScanStrategy=table devicePoolFile={config}/devices.properties @@ -12,6 +12,7 @@ imageSourcesFile={config}/imaging.properties logDaysToLive=-1 logLevel=Finest logLevelConsole=Off +logPath={logs}/{date}_{time} scriptType=py serverEnabled=false serverPort=8080 @@ -23,4 +24,5 @@ userAuthenticator= userManagement=false versionTrackingEnabled=true versionTrackingLogin={config}/agkey +versionTrackingManual=false versionTrackingRemote=ssh\://git@github.psi.ch\:7999/psd/ncs.git diff --git a/config/devices.properties b/config/devices.properties index 75acf10..2fe7266 100644 --- a/config/devices.properties +++ b/config/devices.properties @@ -1,6 +1,6 @@ #mm=ch.psi.pshell.epics.Motor PO2DV-NCS-LS:MOTOR #mot=ch.psi.pshell.epics.ChannelDouble MTEST-GOBBO:MOT1 5 -#dev=ch.psi.pshell.dev.DummyRegister 6 +#dev=ch.psi.pshell.device.DummyRegister 6 #dev2=ch.psi.pshell.dev.MyDevice #$vhq=ch.psi.pshell.epics.ChannelDouble T-MMDV5:IST:2 Read 6 #outc=ch.psi.pshell.epics.ChannelDouble TESTIOC:TESTCALCOUT:Output @@ -13,9 +13,9 @@ #pv=ch.psi.pshell.epics.ProcessVariable TESTIOC:TESTCALCOUT:Input #$motor=ch.psi.pshell.epics.Motor MTEST-GOBBO:MOT1 #$motor2=ch.psi.pshell.epics.Motor MTEST-GOBBO:MOT2 -#table=ch.psi.pshell.dev.MotorGroupBase motor motor2 +#table=ch.psi.pshell.device.MotorGroupBase motor motor2 #manip=ch.psi.pshell.epics.Manipulator -#tab=ch.psi.pshell.dev.MotorGroupDiscretePositioner table +#tab=ch.psi.pshell.device.MotorGroupDiscretePositioner table #img=ch.psi.pshell.epics.ChannelByteArray 13SIM1:image1:ArrayData -1 1048576 #det=ch.psi.pshell.epics.AreaDetector 13SIM1:cam1 13SIM1:image1 #$scienta=ch.psi.pshell.epics.Scienta 13SIM1:cam1 13SIM1:image1