Brings branch up-to-date with bug_fixes branch..

    ..Except for Live Viewers IPs, File Writer path specific to dev PC.

Author: dw96

control/config/hexitec_single_node_no_hardware.cfg

@@ -0,0 +1,42 @@
+[server]
+debug_mode = 1
+http_port  = 8888
+http_addr  = 127.0.0.1
+adapters   = hexitec, system_info, live_view, live_histogram, fr, fp, file_interface
+
+[tornado]
+logging = debug
+
+[adapter.hexitec]
+module = hexitec.adapter.HexitecAdapter
+
+fem =
+    farm_mode = control/config/hexitec_single_node_no_hardware_farm_mode.json
+
+[adapter.live_view]
+module = odin_data.live_view_adapter.LiveViewAdapter
+live_view_endpoints = tcp://127.0.0.1:5020
+default_colormap = Jet
+
+[adapter.live_histogram]
+module = hexitec.live_histogram_adapter.LiveViewAdapter
+live_view_endpoints = tcp://127.0.0.1:5021
+default_colormap = Jet
+
+[adapter.fr]
+module = odin_data.frame_receiver_adapter.FrameReceiverAdapter
+endpoints = 127.0.0.1:5000
+update_interval = 5.0
+
+[adapter.fp]
+module = odin_data.frame_processor_adapter.FrameProcessorAdapter
+endpoints = 127.0.0.1:5004
+update_interval = 5.0
+
+[adapter.system_info]
+module = odin.adapters.system_info.SystemInfoAdapter
+
+[adapter.file_interface]
+module = hexitec.FileInterface.FileInterfaceAdapter
+directories =
+    odin_data = data/config/

control/config/hexitec_single_node_no_hardware_farm_mode.json

@@ -0,0 +1,23 @@
+{
+  "camera_ctrl_ip": "10.0.3.100",
+  "camera_ctrl_mac": "62:00:00:00:01:0A",
+  "camera_ctrl_port": "61648",
+  "server_ctrl_port": "61649",
+  "control_interface": "em1",
+  "control_lane": "1",
+  "data1_interface": "em2",
+  "data1_lane": "2",
+  "data2_interface": "em1",
+  "data2_lane": "3",
+  "farm_server_1_ip": "10.0.2.1",
+  "farm_server_1_mac": "9c:69:b4:60:b8:26",
+  "farm_camera_1_ip": "10.0.2.101",
+  "farm_camera_1_mac": "62:00:00:00:01:0B",
+  "farm_server_2_ip": "10.0.1.1",
+  "farm_server_2_mac": "9c:69:b4:60:b8:25",
+  "farm_camera_2_ip": "10.0.1.102",
+  "farm_camera_2_mac": "62:00:00:00:01:0C",
+  "farm_target_ip": "10.0.2.1",
+  "farm_target_mac": "9c:69:b4:60:b8:26",
+  "farm_target_port": "61651"
+}

control/src/hexitec/HexitecFem.py

@@ -153,7 +153,6 @@ def __init__(self, parent, config):
         self.acquire_start_time = ""
         self.acquire_stop_time = ""
         self.acquire_time = 0.0
-        self.acquire_timestamp = 0
         self.offsets_timestamp = 0
 
         # Track history of errors
@@ -642,7 +641,7 @@ def power_up_modules(self):
                 self.flag_error(message, error)
                 return
 
-            # Switch HV on
+            # Switch HV (Power Board) on
             success = self.broadcast_VSRs.hv_enable()
             hv_statuses = self.broadcast_VSRs._get_status(hv=True, all_vsrs=True)
             logging.debug("HV Status: 0x{}".format(hv_statuses))
@@ -775,9 +774,6 @@ def acquire_data(self):
             logging.debug(f"Set number frames to: {self.number_frames}")
             self.set_nof_frames(self.number_frames)
 
-            # How to convert datetime object to float?
-            self.acquire_timestamp = time.time()    # Utilised by adapter's check_fem_watchdog
-
             logging.debug("Enable data")
             self.data_en(enable=True)
             time.sleep(0.2)

control/src/hexitec/adapter.py

@@ -309,10 +309,7 @@ def polling(self):  # pragma: no cover
         # Poll FEM acquisition & health status
         self.poll_fem()
 
-        # Watchdog: Watch FEM in case no data from hardware triggered by fem.acquire_data()
-        self.check_fem_watchdog()
-
-        # TODO: WATCHDOG, monitor HexitecDAQ rate of frames_processed updated.. (Break if stalled)
+        # Monitor HexitecDAQ rate of frames_processed updated.. (Break if stalled)
         if self.daq.processing_interruptable:
             self.check_daq_watchdog()
 
@@ -343,23 +340,6 @@ def poll_fem(self):
         self.status_message = self.fem._get_status_message()
         self.system_health = self.system_health and self.fem_health
 
-    # TODO: Revisit and update once firmware data readout available - Redundant?
-    def check_fem_watchdog(self):
-        """Check data sent when FEM acquiring data."""
-        if self.acquisition_in_progress:
-            # TODO: Monitor FEM in case no data following fem.acquire_data() call
-            if (self.fem.hardware_busy):
-                fem_begun = self.fem.acquire_timestamp
-                delta_time = time.time() - fem_begun
-                logging.debug("    FEM w-dog: {0:.2f} < {1:.2f}".format(delta_time,
-                                                                        self.fem_tx_timeout))
-                # if (delta_time > self.fem_tx_timeout):
-                #     self.fem.stop_acquisition = True
-                #     self.shutdown_processing()
-                #     logging.error("FEM data transmission timed out")
-                #     error = "Timed out waiting ({0:.2f} seconds) for FEM data".format(delta_time)
-                #     self.fem._set_status_message(error)
-
     def check_daq_watchdog(self):
         """Monitor DAQ's frames_processed while data processed.
 

control/static/js/odin_server.js

@@ -27,7 +27,7 @@ var odin_cold_initialisation = true;
 // Called once, when page 1st loaded
 document.addEventListener("DOMContentLoaded", function () {
     hexitec_endpoint = new AdapterEndpoint("hexitec");
-    liveview_endpoint = new AdapterEndpoint("live_histogram");
+    livehisto_endpoint = new AdapterEndpoint("live_histogram");
     'use strict';
 
     document.querySelector('#odin-control-message').innerHTML = "Disconnected, Idle";
@@ -223,6 +223,16 @@ function toggle_ui_elements(bBool) {
     document.querySelector('#hdf-file-path-text').disabled = bBool;
     document.querySelector('#hdf-file-name-text').disabled = bBool;
     document.querySelector('#hexitec-config-text').disabled = bBool;
+
+    document.querySelector('#lv_dataset_select').disabled = bBool;
+    document.querySelector('#lvframes-frame-frequency-text').disabled = bBool;
+    document.querySelector('#lvframes-per-second-text').disabled = bBool;
+    document.querySelector('#lvspectra-per-second-text').disabled = bBool;
+    document.querySelector('#lvspectra-frame-frequency-text').disabled = bBool;
+    document.querySelector('#lvframes-frame-frequency-text').disabled = bBool;
+    document.querySelector('#threshold-lower-text').disabled = bBool;
+    document.querySelector('#threshold-upper-text').disabled = bBool;
+    document.querySelector('#image-frequency-text').disabled = bBool;
 }
 
 function update_ui_with_leak_detector_settings(result){
@@ -290,8 +300,6 @@ function poll_fem() {
                         const frames = result["value"][i].frames;
                         const decoder = result["value"][i].decoder;
                         const buffers = result["value"][i].buffers;
-                        // document.querySelector('#frames_received' + (i+1)).innerHTML = frames.received;
-                        // document.querySelector('#frames_released' + (i+1)).innerHTML = frames.released;
                         document.querySelector('#frames_dropped' + (i+1)).innerHTML = frames.dropped;
                         document.querySelector('#frames_timedout' + (i+1)).innerHTML = frames.timedout;
 
@@ -793,7 +801,7 @@ function bin_start_changed() {
             bin_start.classList.add('alert-danger');
         });
     // Support histogram (1D) Live view data
-    liveview_endpoint.put(parseFloat(bin_start.value), 'bin_start')
+    livehisto_endpoint.put(parseFloat(bin_start.value), 'bin_start')
         .catch(error => {
             console.log("Couldn't update bin_start");
         });
@@ -811,7 +819,7 @@ function bin_end_changed() {
             bin_end.classList.add('alert-danger');
         });
     // Support histogram (1D) Live view data
-    liveview_endpoint.put(parseFloat(bin_end.value), 'bin_end')
+    livehisto_endpoint.put(parseFloat(bin_end.value), 'bin_end')
         .catch(error => {
             console.log("Couldn't update bin_end");
         });
@@ -829,7 +837,7 @@ function bin_width_changed() {
             bin_width.classList.add('alert-danger');
         });
     // Support histogram (1D) Live view data
-    liveview_endpoint.put(parseFloat(bin_width.value), 'bin_width')
+    livehisto_endpoint.put(parseFloat(bin_width.value), 'bin_width')
         .catch(error => {
             console.log("Couldn't update bin_width");
         });

control/test/hexitec/package/test_adapter.py

@@ -294,18 +294,6 @@ def test_poll_fem_handles_processing_completed(self):
         assert self.test_adapter.detector.acquisition_in_progress is False
         assert self.test_adapter.detector.fem.acquisition_completed is False
 
-    # TODO: Revisit when fem_watchdog reworked
-    def test_check_fem_watchdog(self):
-        """Test fem watchdog works."""
-        self.test_adapter.detector.acquisition_in_progress = True
-        self.test_adapter.detector.fem.hardware_busy = True
-        self.test_adapter.detector.fem.acquire_timestamp = time.time()
-        self.test_adapter.detector.fem_tx_timeout = 0
-        self.test_adapter.detector.check_fem_watchdog()
-        # # Ensure shutdown_processing() was called [it changes the following two bools]
-        # assert self.test_adapter.detector.daq.shutdown_processing is True
-        # assert self.test_adapter.detector.acquisition_in_progress is False
-
     def test_check_daq_watchdog(self):
         """Test daq watchdog works."""
         self.test_adapter.detector.daq.in_progress = True

control/test/hexitec/package/test_fem.py

@@ -188,7 +188,7 @@ def test_read_sensors_Exception(self):
             self.test_fem.fem.read_temperatures_humidity_values = Mock()
             self.test_fem.fem.read_temperatures_humidity_values.side_effect = Exception()
             self.test_fem.fem.read_sensors()
-            time.sleep(0.5)
+            time.sleep(0.2)
             error = "Reading sensors failed"
             assert self.test_fem.fem._get_status_error() == error
 
@@ -200,7 +200,7 @@ def test_read_sensors_HexitecFemError(self):
             self.test_fem.fem.read_temperatures_humidity_values = Mock()
             self.test_fem.fem.read_temperatures_humidity_values.side_effect = HexitecFemError()
             self.test_fem.fem.read_sensors()
-            time.sleep(0.5)
+            time.sleep(0.2)
             error = "Failed to read sensors"
             assert self.test_fem.fem._get_status_error() == error
         assert self.test_fem.fem.parent.software_state == "Error"
@@ -626,12 +626,12 @@ def test_acquire_data(self):
 
     def test_acquire_data_handles_exception(self):
         """Test function handles exception."""
+        self.test_fem.fem.create_timestamp = Mock()
+        self.test_fem.fem.create_timestamp.side_effect = Exception()
         with patch("hexitec.HexitecFem.IOLoop"):
-            with patch("time.time") as mock_time:
-                mock_time.side_effect = Exception()
-                with pytest.raises(Exception) as exc_info:
-                    self.test_fem.fem.acquire_data()
-                assert exc_info.type is Exception
+            with pytest.raises(Exception) as exc_info:
+                self.test_fem.fem.acquire_data()
+            assert exc_info.type is Exception
 
     def test_check_acquire_finished_handles_cancel(self):
         """Test check_acquire_finished calls acquire_data_completed if acquire cancelled."""
@@ -737,7 +737,7 @@ def test_collect_offsets(self):
         self.test_fem.fem.await_dc_captured = Mock()
         self.test_fem.fem.clr_dc_controls = Mock()
         self.test_fem.fem.collect_offsets()
-        time.sleep(0.3)
+        # time.sleep(0.3)
         assert self.test_fem.fem.hardware_busy is False
         assert self.test_fem.fem.parent.software_state == "Idle"
 
@@ -928,7 +928,7 @@ def test_initialise_system(self, mocked_vsr_module):
         self.test_fem.fem.x10g_rdma.udp_rdma_read = Mock()
         self.test_fem.fem.x10g_rdma.udp_rdma_read.return_value = [255]
         self.test_fem.fem.initialise_system()
-        time.sleep(0.5)
+        time.sleep(0.3)
         assert self.test_fem.fem.parent.software_state == "Idle"
 
     # TODO: Passes but sabotages 3 x test_read_sensors unit tests (lines 167-209)
@@ -962,12 +962,12 @@ def test_initialise_system(self, mocked_vsr_module):
     #     self.test_fem.fem.x10g_rdma.read.return_value = [0xF0]
 
     #     self.test_fem.fem.initialise_system()
-    #     time.sleep(0.5)
+    #     time.sleep(0.2)
     #     self.test_fem.fem.x10g_rdma.write.assert_has_calls([
     #         call(0x00000020, 0x10, burst_len=1, comment="Enabling training"),
     #         call(0x00000020, 0x00, burst_len=1, comment="Disabling training")
     #     ])
-    #     time.sleep(0.5)
+    #     time.sleep(0.2)
     #     vsr_status_addr = 0x000003E8
     #     index = 0
     #     self.test_fem.fem.x10g_rdma.read.assert_has_calls([
@@ -984,15 +984,15 @@ def test_initialise_system_handles_HexitecFemError(self):
         self.test_fem.fem.initialise_vsr = Mock()
         self.test_fem.fem.initialise_vsr.side_effect = HexitecFemError("E")
         self.test_fem.fem.initialise_system()
-        time.sleep(0.5)
+        time.sleep(0.3)
         assert self.test_fem.fem.status_error == "Failed to initialise camera: {}".format("E")
 
     def test_initialise_system_handles_Exception(self):
         """Test function handles Exception."""
         self.test_fem.fem.initialise_vsr = Mock()
         self.test_fem.fem.initialise_vsr.side_effect = Exception("E")
         self.test_fem.fem.initialise_system()
-        time.sleep(0.5)
+        time.sleep(0.2)
         assert self.test_fem.fem.status_error == "Camera initialisation failed: {}".format("E")
 
     # # TODO: Prevent unrelated unit tests failing: ??
@@ -1011,7 +1011,7 @@ def test_initialise_system_handles_Exception(self):
     #     fake_sleep.start()
     #     with patch('logging.error') as mock_log:
     #         self.test_fem.fem.initialise_system()
-    #         time.sleep(0.5)
+    #         time.sleep(0.2)
     #         # assert self.test_fem.fem.status_error == "Failed to initialise camera"
     #         mock_log.assert_called()
     #     fake_sleep.stop()
@@ -1028,7 +1028,7 @@ def test_initialise_system_handles_Exception(self):
     #     fake_sleep.start()
     #     with patch('logging.error') as mock_log:
     #         self.test_fem.fem.initialise_system()
-    #         time.sleep(0.5)
+    #         time.sleep(0.2)
     #         # assert self.test_fem.fem.status_error == "Failed to initialise camera"
     #         mock_log.assert_called()
     #     fake_sleep.stop()