JFJochStateMachine: Notify everyone on CalibrateDetector finished + small modifications to handling state

broker/JFJochStateMachine.cpp

@@ -82,7 +82,7 @@ void JFJochStateMachine::CalibrateJUNGFRAU(std::unique_lock<std::mutex> &ul) {
     pixel_mask.LoadDetectorBadPixelMask(experiment, calibration.get());
 }
 
-void JFJochStateMachine::CalibrateDetector(std::unique_lock<std::mutex> &ul) {
+void JFJochStateMachine::CalibrateDetector(std::unique_lock<std::mutex> ul) {
     cancel_sequence = false;
 
     pixel_mask = PixelMask(experiment);
@@ -307,15 +307,12 @@ void JFJochStateMachine::Initialize() {
 void JFJochStateMachine::Pedestal() {
     std::unique_lock ul(m);
 
+    SetState(JFJochState::Busy, "Updating calibration", BrokerStatus::MessageSeverity::Info);
+
     if (state != JFJochState::Idle)
         throw WrongDAQStateException("Must be idle to take pedestal");
 
-    measurement = std::async(std::launch::async, &JFJochStateMachine::PedestalThread, this, std::move(ul));
-}
-
-
-void JFJochStateMachine::PedestalThread(std::unique_lock<std::mutex> ul) {
-    CalibrateDetector(ul);
+    measurement = std::async(std::launch::async, &JFJochStateMachine::CalibrateDetector, this, std::move(ul));
 }
 
 void JFJochStateMachine::InitializeThread(std::unique_lock<std::mutex> ul) {
@@ -338,7 +335,7 @@ void JFJochStateMachine::InitializeThread(std::unique_lock<std::mutex> ul) {
         SetState(JFJochState::Error, e.what(), BrokerStatus::MessageSeverity::Error);
         throw;
     }
-    CalibrateDetector(ul);
+    CalibrateDetector(std::move(ul));
 }
 
 void JFJochStateMachine::Trigger() {

broker/JFJochStateMachine.h

@@ -134,7 +134,7 @@ class JFJochStateMachine {
     bool IsRunning() const; // Is state Busy/Pedestal/Measure
     void ResetError() noexcept;
     void TakeDarkMaskInternal(std::unique_lock<std::mutex> &ul);
-    void CalibrateDetector(std::unique_lock<std::mutex> &ul);
+    void CalibrateDetector(std::unique_lock<std::mutex> ul);
     void CalibrateJUNGFRAU(std::unique_lock<std::mutex> &ul);
     void TakePedestalInternalG0(std::unique_lock<std::mutex> &ul);
     void TakePedestalInternalG1(std::unique_lock<std::mutex> &ul, int32_t storage_cell = 0);