From bd50f65668346efc30646fe866f3b987f064aeac Mon Sep 17 00:00:00 2001 From: gac-x12sa Date: Thu, 5 Jan 2023 14:15:36 +0100 Subject: [PATCH] Closedown --- script/devices/Detector.py | 4 ++-- script/devices/StdDaq.py | 4 ++-- script/local.py | 8 +++++--- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/script/devices/Detector.py b/script/devices/Detector.py index de32cba..a2ae8af 100644 --- a/script/devices/Detector.py +++ b/script/devices/Detector.py @@ -1,7 +1,7 @@ class Detector(DeviceBase): def __init__(self, name): - DeviceBase.__init__(self, name, simulated=False) - if simulated: + DeviceBase.__init__(self, name, is_simulated=False) + if is_simulated: self.setSimulated() self.simulated_pars = {} diff --git a/script/devices/StdDaq.py b/script/devices/StdDaq.py index b27c67a..425e1a1 100644 --- a/script/devices/StdDaq.py +++ b/script/devices/StdDaq.py @@ -1,9 +1,9 @@ class StdDaq(DeviceBase): - def __init__(self, name, url, simulated=False): + def __init__(self, name, url, is_simulated=False): DeviceBase.__init__(self, name) self.url=url self.req_id = None - if simulated: + if is_simulated: self.setSimulated() self.simulated_id=1 self.simulated_config = { diff --git a/script/local.py b/script/local.py index 76a23f9..6215fc7 100644 --- a/script/local.py +++ b/script/local.py @@ -11,6 +11,8 @@ DETECTOR_ADDRESS = "tcp://10.30.40.211:15000" DETECTOR_ADDRESS = "tcp://129.129.95.40:15000" DETECTOR_IMAGE_MODULO = 1 +STD_DAQ_ADDRESS = "http://127.0.0.1:5000" + # Devices #Array10 scripted @@ -21,11 +23,11 @@ run("devices/StdDaq") #Array10 in plugin #Array10 = get_context().getClassByName("Array10") -add_device(Array10("stream", DETECTOR_ADDRESS, ZMQ.SUB), True) +add_device(Array10("stream", DETECTOR_ADDRESS , ZMQ.SUB), True) add_device(stream.devMatrix, True) add_device(RegisterMatrixSource("image", stream.devMatrix), True) stream.devMatrix.modulo = DETECTOR_IMAGE_MODULO -add_device(Detector("detector"), True) -add_device(StdDaq("std_daq"), True) \ No newline at end of file +add_device(Detector("detector", True), True) +add_device(StdDaq("std_daq", url, True), True) \ No newline at end of file