diff --git a/config/config.properties b/config/config.properties index 44f4303..ec55795 100755 --- a/config/config.properties +++ b/config/config.properties @@ -1,34 +1,37 @@ -#Tue Jun 16 15:56:13 CEST 2020 -autoSaveScanData=true -simulation=false -commandExecutionEvents=false -logDaysToLive=50 -userAuthenticator= -logLevelConsole=Off -scanStreamerPort=-1 -parallelInitialization=false -versionTrackingManual=false +#Mon Aug 17 09:27:23 CEST 2020 hostName=null userManagement=false instanceName=MA +autoSaveScanData=true +simulation=false dataServerPort=-1 hideServerMessages=false serverPort=8080 versionTrackingEnabled=true dataPath={data}/{year}_{month}/{date}/{date}_{time}_{name} serverEnabled=false +commandExecutionEvents=false +logDaysToLive=50 depthDimension=0 dataScanReleaseRecords=false dataScanPreserveTypes=false logLevel=Info +dataScanSaveOutput=false dataScanFlushRecords=false logPath={logs}/{date}_{time} dataLayout=default terminalEnabled=false notificationLevel=Off +userAuthenticator= +logLevelConsole=Off terminalPort=3579 +scanStreamerPort=-1 +dataScanSaveScript=false +dataScanSaveSetpoints=false +parallelInitialization=false createSessionFiles=false versionTrackingLogin={context}/svcusr-hlapp_robot +versionTrackingManual=false versionTrackingRemote=git@git.psi.ch\:pshell_config/sf-ma.git dataProvider=h5 saveCommandStatistics=false diff --git a/devices/Camera Server.properties b/devices/Camera Server.properties new file mode 100755 index 0000000..a08bbe9 --- /dev/null +++ b/devices/Camera Server.properties @@ -0,0 +1,25 @@ +#Wed Jul 01 16:21:21 CEST 2020 +spatialCalOffsetY=NaN +spatialCalOffsetX=NaN +colormapLogarithmic=false +scale=1.0 +grayscale=false +spatialCalScaleX=NaN +spatialCalScaleY=NaN +colormapMax=NaN +rescaleOffset=0.0 +roiWidth=-1 +colormap=Grayscale +invert=false +colormapMin=NaN +rotation=0.0 +rotationCrop=false +rescaleFactor=1.0 +spatialCalUnits=mm +flipVertically=false +roiHeight=-1 +flipHorizontally=false +colormapAutomatic=false +roiY=0 +roiX=0 +transpose=false diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index d20a260..b730db6 100755 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,6 +1,6 @@ -#Tue Jun 16 14:47:51 CEST 2020 -spatialCalOffsetY=-50.11933174224343 -spatialCalOffsetX=-50.11933174224343 +#Wed Jul 22 14:19:28 CEST 2020 +spatialCalOffsetY=-50.04061738424045 +spatialCalOffsetX=-51.61290322580645 colormapLogarithmic=false scale=1.0 grayscale=false