From 4b0ace744f5c6ead4066a0ddd0af0ee77e5ecfb7 Mon Sep 17 00:00:00 2001 From: sfop Date: Thu, 30 Mar 2017 09:35:24 +0200 Subject: [PATCH] Closedown --- devices/CurrentCamera.properties | 10 +++++----- script/local.py | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties index d12ae18..2bcb361 100644 --- a/devices/CurrentCamera.properties +++ b/devices/CurrentCamera.properties @@ -1,4 +1,4 @@ -#Thu Mar 30 09:01:35 CEST 2017 +#Thu Mar 30 09:34:18 CEST 2017 colormap=Flame colormapAutomatic=true colormapMax=3000.0 @@ -21,9 +21,9 @@ rotation=0.0 rotationCrop=false scale=1.0 serverURL=localhost\:10000 -spatialCalOffsetX=-50.03909304143862 -spatialCalOffsetY=-50.048875855327466 -spatialCalScaleX=-1.0 -spatialCalScaleY=-1.0 +spatialCalOffsetX=-630.5060320164276 +spatialCalOffsetY=-612.5104241897614 +spatialCalScaleX=-26.761820720381525 +spatialCalScaleY=-26.595744663521685 spatialCalUnits=mm transpose=false diff --git a/script/local.py b/script/local.py index e034947..5b4aaf7 100755 --- a/script/local.py +++ b/script/local.py @@ -305,7 +305,7 @@ if get_context().isServerEnabled(): #Managing local camtool server -CAMTOOL_SERVER_SCRIPT = "camtool_pshell" #"cam_server" +CAMTOOL_SERVER_SCRIPT = "cam_server" #"camtool_pshell" def _get_camtool_port(): return camtool.url[camtool.url.rfind(":")+1:]