Closedown

This commit is contained in:
gac-x12sa
2023-01-05 14:15:36 +01:00
parent f71cb831b5
commit bd50f65668
3 changed files with 9 additions and 7 deletions

View File

@@ -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 = {}

View File

@@ -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 = {

View File

@@ -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)
add_device(Detector("detector", True), True)
add_device(StdDaq("std_daq", url, True), True)