From c0f54979874bca42938a2a63be7d60a0a0301170 Mon Sep 17 00:00:00 2001 From: gac-x12sa Date: Tue, 20 Dec 2022 14:13:00 +0100 Subject: [PATCH] Closedown --- script/devices/Array10.py | 6 +----- script/local.py | 4 ++-- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/script/devices/Array10.py b/script/devices/Array10.py index f55d877..2674f10 100644 --- a/script/devices/Array10.py +++ b/script/devices/Array10.py @@ -84,20 +84,16 @@ class Array10(DeviceBase, Readable, Cacheable, Readable.ReadableType): def rx_thread(self): self.getLogger().info("Enter rx thread"); try: - print "ENTER" self.context = ZMQ.context(1) self.socket = self.context.socket(self.mode) self.socket.connect(self.address) - print "RUNNING" while self.running: header = self.socket.recv(ZMQ.NOBLOCK) - if (header is not None): - print "Header" + if (header is not None): try: self.header=json.loads(''.join(chr(i) for i in header)) self.data = self.socket.recv() if self.data is not None: - print "Data" self.setCache({"header":self.header, "data":self.data}, None) self.message_count=self.message_count+1 if self.array_dev is not None: diff --git a/script/local.py b/script/local.py index aa4db5f..e7ea494 100644 --- a/script/local.py +++ b/script/local.py @@ -1,7 +1,7 @@ ################################################################################################### # Deployment specific global definitions - executed after startup.py ################################################################################################### - +import org.zeromq.ZMQ as ZMQ import requests # Definitions @@ -13,7 +13,7 @@ DETECTOR_IMAGE_MODULO = 1 run("devices/Array10") -add_device(Array10("eiger", DETECTOR_ADDRESS, modulo_array=1, modulo_matrix=DETECTOR_IMAGE_MODULO), True) +add_device(Array10("eiger", DETECTOR_ADDRESS, modulo_array=1, modulo_matrix=DETECTOR_IMAGE_MODULO, mode=ZMQ.PULL), True) add_device(eiger.array_dev, True) add_device(eiger.matrix_dev, True) add_device(RegisterMatrixSource("image", eiger.matrix_dev), True)