From f917e6808087bbaaa5072dc6ff6961ed5ee34d2e Mon Sep 17 00:00:00 2001
From: gac-x12sa <gac-x12sa@x12sa-cons-01.psi.ch>
Date: Mon, 3 Apr 2023 15:49:29 +0200
Subject: [PATCH] Closedown

---
 devices/image.properties  |  4 ++--
 script/devices/Array10.py | 18 +++++++++---------
 script/local.py           |  2 +-
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/devices/image.properties b/devices/image.properties
index 9204e9e..edcab2e 100644
--- a/devices/image.properties
+++ b/devices/image.properties
@@ -1,4 +1,4 @@
-#Mon Apr 03 14:44:14 CEST 2023
+#Mon Apr 03 15:27:08 CEST 2023
 spatialCalOffsetY=NaN
 spatialCalOffsetX=NaN
 colormapLogarithmic=false
@@ -9,7 +9,7 @@ spatialCalScaleY=NaN
 colormapMax=NaN
 rescaleOffset=0.0
 roiWidth=-1
-colormap=Grayscale
+colormap=Temperature
 invert=false
 colormapMin=NaN
 rotation=0.0
diff --git a/script/devices/Array10.py b/script/devices/Array10.py
index fbc65ad..7742e05 100644
--- a/script/devices/Array10.py
+++ b/script/devices/Array10.py
@@ -80,14 +80,14 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
             self.socket = self.context.socket(self.mode)
             self.socket.connect(self.address)
             if self.mode == ZMQ.SUB:
-                self.socket.subscribe("")
-            self.getLogger().info("Running " +  str(self.mode) + " "  + str(self.address))
-            first = True
-            while self.running:
-                header = self.socket.recv(ZMQ.NOBLOCK)  
-                if (header is not None):                                    
-                    try:
-                        self.header=json.loads(''.join(chr(i) for i in header))
+                    self.socket.subscribe("")
+                self.getLogger().info("Running " +  str(self.mode) + " "  + str(self.address))
+                first = True
+                while self.running:
+                    header = self.socket.recv(ZMQ.NOBLOCK)  
+                    if (header is not None):                                    
+                        try:
+                            self.header=json.loads(''.join(chr(i) for i in header))
                         self.shape = self.header.get("shape", None)
                         self.dtype = self.header.get("type", "int8")
                         data = self.socket.recv()  
@@ -97,7 +97,7 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
                             self.message_count=self.message_count+1
                             self.devArray.set(self.data)
                             if self.message_count % self.devMatrix.modulo == 0:
-                                if self.shape: self.shape=(self.shape[1],self.shape[0]) #TODO: FIXME
+                                #if self.shape: self.shape=(self.shape[1],self.shape[0]) #TODO: FIXME
                                 self.devMatrix.set(self.data, self.shape)
                             continue
                     except Exception as e:
diff --git a/script/local.py b/script/local.py
index f6fcd3d..2844694 100644
--- a/script/local.py
+++ b/script/local.py
@@ -19,7 +19,7 @@ STD_DAQ_ADDRESS = "http://127.0.0.1:5000"
 # Devices
 
 #Array10 scripted
-run("devices/Array10")
+#run("devices/Array10")
 run("devices/Detector")
 run("devices/StdDaq")