Implement Odin-data's End of Acquisition Frame

control/src/hexitec/HexitecDAQ.py

@@ -268,15 +268,6 @@ def processing_check_loop(self):
         # Not fudge initialisation; Check HDF/histogram processing progress
         processing_status = self.get_od_status('fp').get(self.plugin, {'frames_processed': 0})
 
-        # # Debugging information:
-        # hdf_status = self.get_od_status('fp').get('hdf', {"frames_processed": 0})
-        # his_status = self.get_od_status('fp').get('histogram', {'frames_processed': 0})
-        # print("")
-        # logging.debug("      proc'g_chek_loop, hdf (%s) v his (%s) v frm_end_acq (%s) PLUG = %s" %
-        #              (hdf_status['frames_processed'], his_status['frames_processed'],
-        #               self.frame_end_acquisition, self.plugin))
-        # print("")
-
         if processing_status['frames_processed'] == self.frame_end_acquisition:
             delay = 1.0
             IOLoop.instance().call_later(delay, self.stop_acquisition)
@@ -291,7 +282,9 @@ def processing_check_loop(self):
                 if self.shutdown_processing:
                     self.shutdown_processing = False
                     self.in_progress = False
-                    IOLoop.instance().add_callback(self.stop_acquisition)
+                    # Don't turn off FileWriterPlugin; Wait for EndOfAcquisition to flush out histograms
+                    self.daq_stop_time = '%s' % (datetime.now().strftime(HexitecDAQ.DATE_FORMAT))
+                    self.file_writing = False
                     return
             else:
                 # Data still bein' processed
@@ -525,7 +518,7 @@ def set_file_writing(self, writing):
         request.body = "{}".format(self.number_frames)
         self.adapters["fp"].put(command, request)
 
-        # Finally, update self_writing so FEM(s) can safely begin sending data
+        # Finally, update own file_writing so FEM(s) know the status
         self.file_writing = writing
 
     def _config_odin_data(self, adapter):

control/src/hexitec/adapter.py

@@ -714,6 +714,12 @@ def cancel_acquisition(self, put_data=None):
         """
         for fem in self.fems:
             fem.stop_acquisition = True
+
+        # Inject End of Acquisition Frame
+        command = "config/inject_eoa"
+        request = ApiAdapterRequest("", content_type="application/json")
+        self.adapters["fp"].put(command, request)
+
         self.shutdown_processing()
 
     def _collect_offsets(self, msg):
@@ -724,10 +730,6 @@ def _collect_offsets(self, msg):
     def commit_configuration(self, msg):
         """Push HexitecDAQ's 'config/' ParameterTree settings into FP's plugins."""
         self.daq.commit_configuration()
-        # # DEBUGGING ONLY: Ensure fudge for everyone(!)
-        # self.first_initialisation  = True
-        # self.fems[0].first_initialisation  = True
-        # self.daq.first_initialisation = True
 
     def get_server_uptime(self):
         """

control/test/hexitec/package/test_DAQ.py

@@ -466,8 +466,10 @@ def test_processing_check_loop_handles_missing_frames(self):
             self.test_daq.daq.parent.fems[0].hardware_busy = True
             self.test_daq.daq.frame_end_acquisition = 10
             self.test_daq.daq.shutdown_processing = True
+            self.test_daq.daq.frames_processed = 0
             self.test_daq.daq.processing_check_loop()
-            mock_loop.instance().add_callback.assert_called_with(self.test_daq.daq.stop_acquisition)
+            assert self.test_daq.daq.file_writing is False
+            assert self.test_daq.daq.shutdown_processing is False
 
     def test_processing_check_loop_polling_while_data_being_processed(self):
         """Test processing check loop polls itself while data coming in."""

control/test/hexitec/package/test_adapter.py

@@ -617,6 +617,14 @@ def test_check_fem_finished_sending_data_resets_variables_on_completion(self):
 
     def test_cancel_acquisition(self):
         """Test function can cancel (in software) ongoing acquisition."""
+        self.test_adapter.detector.daq.configure_mock(
+            in_progress=False
+        )
+
+        self.test_adapter.detector.fems[0].bias_voltage_refresh = False
+        self.test_adapter.detector.first_initialisation = True
+        self.test_adapter.detector.adapters = self.test_adapter.adapters
+        print(self.test_adapter.adapters)
         self.test_adapter.detector.fems[0].stop_acquisition = False
         self.test_adapter.detector.cancel_acquisition()
 

data/frameProcessor/include/HexitecHistogramPlugin.h

@@ -78,6 +78,7 @@ namespace FrameProcessor
       std::string sensors_layout_str_;
       HexitecSensorLayoutMap sensors_layout_;
 
+      void process_end_of_acquisition();
       void process_frame(boost::shared_ptr<Frame> frame);
 
       void add_frame_data_to_histogram_with_sum(float *frame);

data/frameProcessor/include/HexitecReorderPlugin.h

@@ -63,6 +63,7 @@ namespace FrameProcessor
 
       void process_lost_packets(boost::shared_ptr<Frame>& frame);
       void process_frame(boost::shared_ptr<Frame> frame);
+
       // Float type array version currently used:
       void reorder_pixels(unsigned short *in, float *out);
       // Convert pixels from unsigned short to float type without reordering

data/frameProcessor/src/HexitecHistogramPlugin.cpp

@@ -292,6 +292,17 @@ namespace FrameProcessor
     return true;
   }
 
+  /** Process an EndOfAcquisitionFrame.
+  *
+  * Write histograms to disk on end of acquisition
+  */
+  void HexitecHistogramPlugin::process_end_of_acquisition()
+  {
+    LOG4CXX_INFO(logger_, "End of acquisition frame received, writing histograms to disk");
+    writeHistogramsToDisk();
+    frames_processed_ = 0;
+  }
+
   /**
    * Perform processing on the frame.  Calculate histograms based upon
    * each frame, writing resulting datasets to file when configured