diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp index 5f12abefc..ef831e140 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp @@ -346,6 +346,11 @@ int slsDetectorUsers::startAcquisition() { return myDetector->startAcquisition(); } +int slsDetectorUsers::stopAcquisition() { + return myDetector->stopAcquisition(); +} + + int slsDetectorUsers::setReceiverSilentMode(int i) { return myDetector->setReceiverSilentMode(i); } diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h index 0727bb49c..2823d7cb6 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUsers.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUsers.h @@ -598,11 +598,19 @@ class slsDetectorUsers int stopReceiver(); /** - start detector acquisition in non blocking mode + start detector real time acquisition in non blocking mode + does not include scans, scripts, incrementing file index, s + tarting/stopping receiver, resetting frames caught in receiver \returns OK if all detectors are properly started, FAIL otherwise */ int startAcquisition(); + /** + stop detector real time acquisition + \returns OK if all detectors are properly started, FAIL otherwise + */ + int stopAcquisition(); + /** * set receiver in silent mode * @param i 1 sets, 0 unsets (-1 gets) diff --git a/slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp b/slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp index c3771e7e0..a87747cf6 100644 --- a/slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp +++ b/slsDetectorSoftware/slsReceiverInterface/receiverInterface.cpp @@ -163,7 +163,7 @@ int receiverInterface::getLastClientIP(int fnum, char retval[]){ dataSocket->SendDataOnly(&fnum,sizeof(fnum)); dataSocket->ReceiveDataOnly(&ret,sizeof(ret)); - dataSocket->ReceiveDataOnly(retval,sizeof(retval)); + dataSocket->ReceiveDataOnly(retval,INET_ADDRSTRLEN); return ret; }