From c3abc7a144b714c86c59de6ae67fa74737621559 Mon Sep 17 00:00:00 2001
From: gobbo_a <gobbo_a@sf-lc6-64.psi.ch>
Date: Fri, 4 Nov 2016 13:42:09 +0100
Subject: [PATCH] Closedown

---
 config/jcae.properties           |  4 ++--
 devices/CurrentCamera.properties | 14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/config/jcae.properties b/config/jcae.properties
index dcd7b96..2994422 100755
--- a/config/jcae.properties
+++ b/config/jcae.properties
@@ -1,8 +1,8 @@
-#Fri Nov 04 13:39:35 CET 2016
+#Fri Nov 04 13:42:05 CET 2016
 ch.psi.jcae.ContextFactory.addressList=172.26.0.255 172.26.2.255 172.26.8.255 172.26.16.255 172.26.24.255 172.26.32.255 172.26.40.255 172.26.120.255
 ch.psi.jcae.ContextFactory.maxArrayBytes=50000000
 ch.psi.jcae.ChannelFactory.retries=1
-ch.psi.jcae.ChannelFactory.timeout=1500
+ch.psi.jcae.ChannelFactory.timeout=500
 ch.psi.jcae.impl.DefaultChannelService.retries=4
 ch.psi.jcae.impl.DefaultChannelService.timeout=1000
 ch.psi.jcae.ContextFactory.serverPort=
diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 4e53edd..0cd40ac 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,4 +1,4 @@
-#Fri Nov 04 13:39:14 CET 2016
+#Fri Nov 04 13:41:07 CET 2016
 colormap=Rainbow
 colormapAutomatic=true
 colormapMax=0.0
@@ -6,8 +6,8 @@ colormapMin=0.0
 flipHorizontally=false
 flipVertically=false
 grayscale=false
-imageHeight=1200
-imageWidth=1246
+imageHeight=0
+imageWidth=0
 invert=false
 rescaleFactor=1.0
 rescaleOffset=0.0
@@ -18,9 +18,9 @@ roiY=0
 rotation=0.0
 rotationCrop=false
 scale=1.0
-spatialCalOffsetX=-630.0
-spatialCalOffsetY=-612.0
-spatialCalScaleX=-26.761819803746654
-spatialCalScaleY=-26.595744680851062
+spatialCalOffsetX=-685.0
+spatialCalOffsetY=-874.0
+spatialCalScaleX=13.612279307222428
+spatialCalScaleY=12.708498808578236
 spatialCalUnits=mm
 transpose=false