diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp index 40498e5d5..3b77c1085 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp @@ -5034,7 +5034,7 @@ int multiSlsDetector::resetFramesCaught() { -int multiSlsDetector::createReceivingDataSockets(bool destroy){ +int multiSlsDetector::createReceivingDataSockets(const bool destroy){ //number of sockets int numSockets = thisMultiDetector->numberOfDetectors; @@ -5108,7 +5108,7 @@ int multiSlsDetector::createReceivingDataSockets(bool destroy){ -int multiSlsDetector::getData(int isocket, bool masking, int* image, int size, int &acqIndex, int &frameIndex, int &subframeIndex, string &filename){ +int multiSlsDetector::getData(const int isocket, const bool masking, int* image, const int size, int &acqIndex, int &frameIndex, int &subframeIndex, string &filename){ zmq_msg_t message; diff --git a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h index 1cc895fa5..981dd4732 100644 --- a/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h +++ b/slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h @@ -1200,7 +1200,7 @@ class multiSlsDetector : public slsDetectorUtils { * @param destroy is true to destroy all the sockets * @return OK or FAIL */ - int createReceivingDataSockets(bool destroy = false); + int createReceivingDataSockets(const bool destroy = false); @@ -1396,7 +1396,7 @@ private: /** * Gets data from socket */ - int getData(int isocket, bool masking, int* image, int size, int &acqIndex, int &frameIndex, int &subframeIndex, string &filename); + int getData(const int isocket, const bool masking, int* image, const int size, int &acqIndex, int &frameIndex, int &subframeIndex, string &filename); /** Ensures if sockets created successfully */ bool dataSocketsStarted; diff --git a/slsDetectorSoftware/slsDetector/slsDetector.cpp b/slsDetectorSoftware/slsDetector/slsDetector.cpp index e5b0d877c..04e7a8060 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.cpp +++ b/slsDetectorSoftware/slsDetector/slsDetector.cpp @@ -5599,6 +5599,7 @@ char* slsDetector::setReceiver(string receiverIP){ setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]); setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]); + setTimer(ACQUISITION_TIME,thisDetector->timerValue[ACQUISITION_TIME]); setDynamicRange(thisDetector->dynamicRange); if(thisDetector->myDetectorType == EIGER) activate(-1); diff --git a/slsDetectorSoftware/slsDetector/slsDetector.h b/slsDetectorSoftware/slsDetector/slsDetector.h index 508b28000..7f09daa71 100644 --- a/slsDetectorSoftware/slsDetector/slsDetector.h +++ b/slsDetectorSoftware/slsDetector/slsDetector.h @@ -1590,7 +1590,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion { * @param destroy is true to destroy all the sockets * @return OK or FAIL */ - int createReceivingDataSockets(bool destroy = false){return 0;}; + int createReceivingDataSockets(const bool destroy = false){return 0;}; /** Reads frames from receiver through a constant socket diff --git a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h index 18ec00524..791bbc816 100644 --- a/slsDetectorSoftware/slsDetector/slsDetectorUtils.h +++ b/slsDetectorSoftware/slsDetector/slsDetectorUtils.h @@ -660,7 +660,7 @@ virtual int resetFramesCaught()=0; * @param destroy is true to destroy all the sockets * @return OK or FAIL */ -virtual int createReceivingDataSockets(bool destroy = false)=0; +virtual int createReceivingDataSockets(const bool destroy = false)=0; /** Reads frames from receiver through a constant socket