mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-12 21:07:13 +02:00
conflict merged fix, lockin in stop and startandreadallnowait, r_restreamstop moved to stop
This commit is contained in:
@ -1520,14 +1520,6 @@ class multiSlsDetector : public slsDetectorUtils {
|
||||
*/
|
||||
bool isAcquireReady();
|
||||
|
||||
/**
|
||||
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
|
||||
*/
|
||||
int restreamStopFromReceiver();
|
||||
|
||||
private:
|
||||
|
||||
|
Reference in New Issue
Block a user