merge conflict from 3.0.1 to restream stop from recieveR

slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h

@@ -1494,18 +1494,19 @@ class multiSlsDetector  : public slsDetectorUtils {
   bool getAcquiringFlag();
 
   /**
-     Set external gui flag in shared memory
-     \param b set external gui flag
+   * Check if acquiring flag is set, set error if set
+   * \returns FAIL if not ready, OK if ready
    */
-  void setExternalGuiFlag(bool b=false);
+  bool isAcquireReady();
 
   /**
-     Get external gui flag from shared memory
-     \returns external gui flag
+     If data streaming in receiver is enabled,
+     restream the stop dummy packet from receiver
+     Used usually for Moench,
+     in case it is lost in network due to high data rate
+     \returns OK if success else FAIL
    */
-  bool getExternalGuiFlag();
-
-
+  int restreamStopFromReceiver();
 
 private: