WIP

tomcat_bec/device_configs/microxas_test_bed.yaml

@@ -139,50 +139,53 @@ gfcam:
   readoutPriority: monitored
   softwareTrigger: true
 
-gfdaq:
-  description: GigaFrost stdDAQ client
-  deviceClass: tomcat_bec.devices.StdDaqClient
-  deviceConfig:
-    ws_url: 'ws://129.129.95.111:8080'
-    rest_url: 'http://129.129.95.111:5000'
-    data_source_name: 'gfcam'
-  deviceTags:
-  - std-daq
-  - gfcam
-  enabled: false
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: monitored
-  softwareTrigger: false
-
-gf_stream0:
-  description: stdDAQ preview (2 every 555)
-  deviceClass: tomcat_bec.devices.StdDaqPreviewDetector
-  deviceConfig:
-    url: 'tcp://129.129.95.111:20000'
-  deviceTags:
-  - std-daq
-  - gfcam
-  enabled: false
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: monitored
-  softwareTrigger: false
-
-# pcocam:
-#   description: PCO.edge camera client
-#   deviceClass: tomcat_bec.devices.PcoEdge5M
+# gfdaq:
+#   description: GigaFrost stdDAQ client
+#   deviceClass: tomcat_bec.devices.StdDaqClient
 #   deviceConfig:
-#     prefix: 'X02DA-CCDCAM2:'
+#     ws_url: 'ws://129.129.95.111:8080'
+#     rest_url: 'http://129.129.95.111:5000'
+#     data_source_name: 'gfcam'
 #   deviceTags:
-#   - camera
-#   - trigger
-#   - pcocam
-#   enabled: true
+#   - std-daq
+#   - gfcam
+#   enabled: false
 #   onFailure: buffer
 #   readOnly: false
 #   readoutPriority: monitored
-#   softwareTrigger: true
+#   softwareTrigger: false
+
+# gf_stream0:
+#   description: stdDAQ preview (2 every 555)
+#   deviceClass: tomcat_bec.devices.StdDaqPreviewDetector
+#   deviceConfig:
+#     url: 'tcp://129.129.95.111:20000'
+#   deviceTags:
+#   - std-daq
+#   - gfcam
+#   enabled: false
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: monitored
+#   softwareTrigger: false
+
+pcocam:
+  description: PCO.edge camera client
+  deviceClass: tomcat_bec.devices.PcoEdge5M
+  deviceConfig:
+    prefix: 'X02DA-CCDCAM2:'
+    std_daq_live: 'tcp://129.129.95.111:20010'
+    std_daq_ws: 'ws://129.129.95.111:8081'
+    std_daq_rest: 'http://129.129.95.111:5010'
+  deviceTags:
+  - camera
+  - trigger
+  - pcocam
+  enabled: true
+  onFailure: buffer
+  readOnly: false
+  readoutPriority: monitored
+  softwareTrigger: true
 
 # pcodaq:
 #   description: GigaFrost stdDAQ client
@@ -199,16 +202,16 @@ gf_stream0:
 #   readoutPriority: monitored
 #   softwareTrigger: false
 
-pco_stream0:
-  description: stdDAQ preview (2 every 555)
-  deviceClass: tomcat_bec.devices.StdDaqPreviewDetector
-  deviceConfig:
-    url: 'tcp://129.129.95.111:20010'
-  deviceTags:
-  - std-daq
-  - pcocam
-  enabled: true
-  onFailure: buffer
-  readOnly: false
-  readoutPriority: monitored
-  softwareTrigger: false
+# pco_stream0:
+#   description: stdDAQ preview (2 every 555)
+#   deviceClass: tomcat_bec.devices.StdDaqPreviewDetector
+#   deviceConfig:
+#     url: 'tcp://129.129.95.111:20010'
+#   deviceTags:
+#   - std-daq
+#   - pcocam
+#   enabled: true
+#   onFailure: buffer
+#   readOnly: false
+#   readoutPriority: monitored
+#   softwareTrigger: false

tomcat_bec/devices/gigafrost/std_daq_client.py

@@ -306,10 +306,10 @@ class StdDaqClient:
                     msg_timestamp = time.time()
                 except TimeoutError:
                     continue
-                except WebSocketException as ex:
-                    # content = traceback.format_exc()
-                    # TODO: ConnectionCloserError is expected to happen on every reconfiguration
-                    logger.warning(f"Websocket connection closed unexpectedly: {ex}")
+                except WebSocketException:
+                    content = traceback.format_exc()
+                    # TODO: this is expected to happen on every reconfiguration
+                    logger.warning(f"Websocket connection closed unexpectedly: {content}")
                     self.wait_for_connection()
                     continue
                 msg = json.loads(msg)