Fix ZMQ addr

2025-05-20 18:16:09 +02:00
parent aa78da916b
commit c3b64d7256
1 changed files with 10 additions and 5 deletions
@@ -24,16 +24,16 @@ if __name__ == "__main__":
    match mx_beamline():
        case MXBeamline.X06DA:
            default_url = "http://x06da-queue-01.psi.ch:5210"
-            zmq_addr = "tcp://129.129.110.12:9089"
+            default_zmq_addr = "tcp://129.129.110.12:9089"
        case MXBeamline.X10SA:
            default_url = "http://x10aa-queue-01.psi.ch:5210"
-            zmq_addr = None
+            default_zmq_addr = ""
        case MXBeamline.X06SA:
            default_url = "http://x06sa-queue-01.psi.ch:5210"
-            zmq_addr = None
+            default_zmq_addr = ""
        case _:
            default_url = "http://localhost:5210"
-            zmq_addr = None
+            default_zmq_addr = ""

    # Add custom options as needed
    urlOption = QCommandLineOption(["u", "aaredaq-url"],
@@ -48,13 +48,18 @@ if __name__ == "__main__":

    cameraZeroMQ = QCommandLineOption(["s", "sample-camera-zmq"],
                                      "Sample camera ZeroMQ URL",
-                                      "sample-camera-zmq")
+                                      "sample-camera-zmq",
+                                      default_zmq_addr)
    parser.addOption(cameraZeroMQ)

    parser.process(app)

    base_url = parser.value(urlOption)

+    zmq_addr = parser.value(cameraZeroMQ)
+    if zmq_addr == "":
+        zmq_addr = None
+
    if parser.isSet(defaultImage):
        default_image = parser.value(defaultImage)
    else: