Closedown
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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:
|
||||
|
||||
@@ -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")
|
||||
|
||||
|
||||
Reference in New Issue
Block a user