detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

updated users class to reflect zmq changes (separation), fixed warnings

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-11-17 08:46:43 +01:00
parent 4097c37b31
commit f647bdaa48
4 changed files with 22 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetector.h
View File

@ -1643,7 +1643,7 @@ class slsDetector : public slsDetectorUtils, public energyConversion {
/** gets the number of frames caught by any one receiver (to avoid using threadpool) /** gets the number of frames caught by any one receiver (to avoid using threadpool)
\returns number of frames caught by any one receiver (master receiver if exists) \returns number of frames caught by any one receiver (master receiver if exists)
*/ */
int getFramesCaughtByAnyReceiver() {getFramesCaughtByReceiver();}; int getFramesCaughtByAnyReceiver() {return getFramesCaughtByReceiver();};
/** gets the current frame index of receiver /** gets the current frame index of receiver
\returns current frame index of receiver \returns current frame index of receiver

8
slsDetectorSoftware/slsDetector/slsDetectorUsers.cpp
View File

@ -231,12 +231,12 @@ int slsDetectorUsers::enableDataStreamingToClient(int i){
return myDetector->enableDataStreamingToClient(i); return myDetector->enableDataStreamingToClient(i);
} }
int slsDetectorUsers::setReceiverDataStreamingOutPort(int i, int imod){ int slsDetectorUsers::setReceiverDataStreamingOutPort(int i){
return myDetector->setReceiverDataStreamingOutPort(i, imod); return myDetector->setReceiverDataStreamingOutPort(i);
} }
int slsDetectorUsers::setClientDataStreamingInPort(int i, int imod){ int slsDetectorUsers::setClientDataStreamingInPort(int i){
return myDetector->setClientDataStreamingInPort(i, imod); return myDetector->setClientDataStreamingInPort(i);
} }
int64_t slsDetectorUsers::getModuleFirmwareVersion(){ int64_t slsDetectorUsers::getModuleFirmwareVersion(){

12
slsDetectorSoftware/slsDetector/slsDetectorUsers.h
View File

@ -454,23 +454,19 @@ class slsDetectorUsers
/** /**
* Set/Get receiver streaming out ZMQ port * Set/Get receiver streaming out ZMQ port
* If imod is -1, when setting it calculates and sets the port for all individual detectors * For multi modules, it calculates (increments) and sets the ports
* and when getting it returns only the port of individual detector in first position
* @param i sets, -1 gets * @param i sets, -1 gets
* @param imod module index, -1 for all
* @returns receiver streaming out ZMQ port () * @returns receiver streaming out ZMQ port ()
*/ */
int setReceiverDataStreamingOutPort(int i, int imod=-1); int setReceiverDataStreamingOutPort(int i=-1);
/** /**
* Set/Get client streaming in ZMQ port * Set/Get client streaming in ZMQ port
* If imod is -1, when setting it calculates and sets the port for all individual detectors * For multi modules, it calculates (increments) and sets the ports
* and when getting it returns only the port of individual detector in first position
* @param i sets, -1 gets * @param i sets, -1 gets
* @param imod module index, -1 for all
* @returns client streaming in ZMQ port * @returns client streaming in ZMQ port
*/ */
int setClientDataStreamingInPort(int i, int imod=-1); int setClientDataStreamingInPort(int i=-1);
/** /**
get get Module Firmware Version get get Module Firmware Version

43
slsDetectorSoftware/slsDetector/slsDetectorUtils.h
View File

@ -90,48 +90,31 @@ class slsDetectorUtils : public slsDetectorActions, public postProcessing {
int enablePixelMaskCorrection(int i=-1) {if (i>0) setBadChannelCorrection("default"); else if (i==0) setBadChannelCorrection(""); return getBadChannelCorrection();}; int enablePixelMaskCorrection(int i=-1) {if (i>0) setBadChannelCorrection("default"); else if (i==0) setBadChannelCorrection(""); return getBadChannelCorrection();};
int enableCountRateCorrection(int i=-1) {if (i>0) setRateCorrection(i); else if (i==0) setRateCorrection(0); return getRateCorrection();}; int enableCountRateCorrection(int i=-1) {if (i>0) setRateCorrection(i); else if (i==0) setRateCorrection(0); return getRateCorrection();};
/** /**
* Set/Get receiver streaming out ZMQ port * Set/Get receiver streaming out ZMQ port
* For multi modules, it calculates (increments) and sets the ports
* @param i sets, -1 gets * @param i sets, -1 gets
* @param imod module index, -1 for all
* @returns receiver streaming out ZMQ port * @returns receiver streaming out ZMQ port
*/ */
int setReceiverDataStreamingOutPort(int i, int imod) { \ int setReceiverDataStreamingOutPort(int i) { \
// single module if (i >= 0) { ostringstream ss; ss << i; string s = ss.str(); \
if (imod < 0) { \ setNetworkParameter(RECEIVER_STREAMING_PORT, s);} \
if (i >= 0) { \ return atoi(getNetworkParameter(RECEIVER_STREAMING_PORT).c_str());}; \
ostringstream ss; ss << i; string s = ss.str(); \
getSlsDetector(imod)->setReceiverStreamingPort(RECEIVER_STREAMING_PORT, s); \
} \
return atoi(getSlsDetector(imod)->getReceiverStreamingPort().c_str()); \
} \
// multimodule
if (i >= 0) \
setNetworkParameter(RECEIVER_STREAMING_PORT, s); \
return atoi(getSlsDetector(0)->getNetworkParameter(RECEIVER_STREAMING_PORT).c_str());}; \
/** /**
* Set/Get client streaming in ZMQ port * Set/Get client streaming in ZMQ port
* For multi modules, it calculates (increments) and sets the ports
* @param i sets, -1 gets * @param i sets, -1 gets
* @param imod module index, -1 for all
* @returns client streaming in ZMQ port * @returns client streaming in ZMQ port
*/ */
int setClientDataStreamingInPort(int i, int imod=-1){ \ int setClientDataStreamingInPort(int i){ \
// single module if (i >= 0) { ostringstream ss; ss << i; string s = ss.str(); \
if (imod < 0) { \ setNetworkParameter(CLIENT_STREAMING_PORT, s);} \
if (i >= 0) { \ return atoi(getNetworkParameter(CLIENT_STREAMING_PORT).c_str());}; \
ostringstream ss; ss << i; string s = ss.str(); \
getSlsDetector(imod)->setReceiverStreamingPort(CLIENT_STREAMING_PORT, s); \
} \
return atoi(getSlsDetector(imod)->getReceiverStreamingPort().c_str()); \
} \
// multimodule
if (i >= 0) \
setNetworkParameter(CLIENT_STREAMING_PORT, s); \
return atoi(getSlsDetector(0)->getNetworkParameter(CLIENT_STREAMING_PORT).c_str());}; \
};
// string getFilePath(){return fileIO::getFilePath();};;
// string getFilePath(){return fileIO::getFilePath();};;
// string setFilePath(string s){return fileIO::setFilePath(s);}; // string setFilePath(string s){return fileIO::setFilePath(s);};
// string getFileName(){return fileIO::getFileName();}; // string getFileName(){return fileIO::getFileName();};