detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-22 03:40:04 +02:00
Code Issues Actions Packages Releases Activity

smaller changes to make arguments const

Browse Source
This commit is contained in:
Dhanya Maliakal 2016-11-25 12:22:00 +01:00
parent c70f453de4
commit 52dbb7f9fc
5 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5034,7 +5034,7 @@ int multiSlsDetector::resetFramesCaught() {
int multiSlsDetector::createReceivingDataSockets(bool destroy){ int multiSlsDetector::createReceivingDataSockets(const bool destroy){
//number of sockets //number of sockets
int numSockets = thisMultiDetector->numberOfDetectors; 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; zmq_msg_t message;

4
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1200,7 +1200,7 @@ class multiSlsDetector : public slsDetectorUtils {
* @param destroy is true to destroy all the sockets * @param destroy is true to destroy all the sockets
* @return OK or FAIL * @return OK or FAIL
*/ */
int createReceivingDataSockets(bool destroy = false); int createReceivingDataSockets(const bool destroy = false);
@ -1396,7 +1396,7 @@ private:
/** /**
* Gets data from socket * 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 */ /** Ensures if sockets created successfully */
bool dataSocketsStarted; bool dataSocketsStarted;

1
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5599,6 +5599,7 @@ char* slsDetector::setReceiver(string receiverIP){
setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]); setTimer(FRAME_PERIOD,thisDetector->timerValue[FRAME_PERIOD]);
setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]); setTimer(FRAME_NUMBER,thisDetector->timerValue[FRAME_NUMBER]);
setTimer(ACQUISITION_TIME,thisDetector->timerValue[ACQUISITION_TIME]);
setDynamicRange(thisDetector->dynamicRange); setDynamicRange(thisDetector->dynamicRange);
if(thisDetector->myDetectorType == EIGER) if(thisDetector->myDetectorType == EIGER)
activate(-1); activate(-1);

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1590,7 +1590,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
* @param destroy is true to destroy all the sockets * @param destroy is true to destroy all the sockets
* @return OK or FAIL * @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 /** Reads frames from receiver through a constant socket

2
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -660,7 +660,7 @@ virtual int resetFramesCaught()=0;
* @param destroy is true to destroy all the sockets * @param destroy is true to destroy all the sockets
* @return OK or FAIL * @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 /** Reads frames from receiver through a constant socket