Closedown
This commit is contained in:
@@ -24,7 +24,7 @@ class Array10Matrix(ReadonlyAsyncRegisterBase, ReadonlyRegisterMatrix):
|
||||
|
||||
|
||||
class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
|
||||
def __init__(self, name, address, modulo_array=1, modulo_matrix=1, mode=ZMQ.PULL):
|
||||
def __init__(self, name, address, mode=ZMQ.PULL):
|
||||
""" Device implementing communication with over Array10.
|
||||
Args:
|
||||
name(str): device name
|
||||
@@ -40,23 +40,15 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
|
||||
self.running = False
|
||||
self.header=None
|
||||
self.data=None
|
||||
self.array_dev=None
|
||||
self.matrix_dev=None
|
||||
self.devArray=None
|
||||
self.devMatrix=None
|
||||
self.message_count=0
|
||||
|
||||
if modulo_array is not None:
|
||||
self.array_dev = Array10Array(self.name + "_array" )
|
||||
self.addChild(self.array_dev)
|
||||
self.array_dev.modulo = modulo_array
|
||||
else:
|
||||
self.array_dev = None
|
||||
|
||||
if modulo_matrix is not None:
|
||||
self.matrix_dev = Array10Matrix(self.name + "_matrix" )
|
||||
self.addChild(self.matrix_dev)
|
||||
self.matrix_dev.modulo = modulo_matrix
|
||||
else:
|
||||
self.matrix_dev = None
|
||||
self.devArray = Array10Array(self.name + "_array" )
|
||||
self.addChild(self.devArray)
|
||||
self.devMatrix = Array10Matrix(self.name + "_matrix" )
|
||||
self.devMatrix.modulo = 1
|
||||
self.addChild(self.devMatrix)
|
||||
|
||||
|
||||
def doInitialize(self):
|
||||
@@ -102,13 +94,10 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
|
||||
self.data=BufferConverter.fromArray(data, Type.fromKey(self.dtype))
|
||||
self.setCache({"header":self.header, "data":self.data}, None)
|
||||
self.message_count=self.message_count+1
|
||||
if self.array_dev is not None:
|
||||
if self.message_count % self.array_dev.modulo == 0:
|
||||
self.array_dev.set(self.data)
|
||||
if self.matrix_dev is not None:
|
||||
if self.message_count % self.matrix_dev.modulo == 0:
|
||||
#if self.shape: self.shape=(self.shape[1],self.shape[0]) #TODO: FIXME
|
||||
self.matrix_dev.set(self.data, self.shape)
|
||||
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
|
||||
self.devMatrix.set(self.data, self.shape)
|
||||
continue
|
||||
except Exception as e:
|
||||
print e
|
||||
@@ -137,8 +126,8 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType):
|
||||
|
||||
#Testing
|
||||
#add_device(Array10("a10", "tcp://localhost:1234", modulo_array=1, modulo_matrix=10), True)
|
||||
#add_device(a10.array_dev, True)
|
||||
#add_device(a10.matrix_dev, True)
|
||||
#add_device(RegisterMatrixSource("src_a10", a10.matrix_dev), True)
|
||||
#add_device(a10.devArray, True)
|
||||
#add_device(a10.devMatrix, True)
|
||||
#add_device(RegisterMatrixSource("src_a10", a10.devMatrix), True)
|
||||
|
||||
|
||||
|
||||
@@ -13,12 +13,12 @@ DETECTOR_IMAGE_MODULO = 1
|
||||
|
||||
# Devices
|
||||
|
||||
#run("devices/Array10")
|
||||
run("devices/Array10")
|
||||
Array10 = get_context().getClassByName("Array10")
|
||||
#add_device(Array10("eiger", DETECTOR_ADDRESS, modulo_array=1, modulo_matrix=DETECTOR_IMAGE_MODULO, mode=ZMQ.SUB), True)
|
||||
#add_device(eiger.matrix_dev, True)
|
||||
#add_device(RegisterMatrixSource("image", eiger.matrix_dev), True)
|
||||
|
||||
Array10 = get_context().getClassByName("Array10")
|
||||
add_device(Array10("eiger", DETECTOR_ADDRESS, ZMQ.SUB), True)
|
||||
add_device(eiger.devMatrix, True)
|
||||
add_device(RegisterMatrixSource("image", eiger.devMatrix), True)
|
||||
|
||||
Reference in New Issue
Block a user