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

unused values and comments

Browse Source
This commit is contained in:
Erik Frojdh
2019-04-15 18:14:58 +02:00
parent 0cc0c2715b
commit d31446ce07
2 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
slsDetectorSoftware/include/slsDetectorCommand.h
View File

@ -113,7 +113,6 @@ class slsDetectorCommand : public virtual slsDetectorDefs {
std::string cmdFileName(int narg, char *args[], int action, int detPos = -1); std::string cmdFileName(int narg, char *args[], int action, int detPos = -1);
std::string cmdFileIndex(int narg, char *args[], int action, int detPos = -1); std::string cmdFileIndex(int narg, char *args[], int action, int detPos = -1);
std::string cmdRateCorr(int narg, char *args[], int action, int detPos = -1); std::string cmdRateCorr(int narg, char *args[], int action, int detPos = -1);
// std::string cmdThreaded(int narg, char *args[], int action, int detPos = -1);
std::string cmdNetworkParameter(int narg, char *args[], int action, int detPos = -1); std::string cmdNetworkParameter(int narg, char *args[], int action, int detPos = -1);
std::string cmdPort(int narg, char *args[], int action, int detPos = -1); std::string cmdPort(int narg, char *args[], int action, int detPos = -1);
std::string cmdLock(int narg, char *args[], int action, int detPos = -1); std::string cmdLock(int narg, char *args[], int action, int detPos = -1);

16
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -2584,7 +2584,7 @@ void slsDetector::setReceiverStreamingIP(std::string sourceIP) {
// if empty, give rx_hostname // if empty, give rx_hostname
if (sourceIP.empty()) { if (sourceIP.empty()) {
if (!strcmp(detector_shm()->receiver_hostname, "none")) { if (strcmp(detector_shm()->receiver_hostname, "none") == 0) {
throw RuntimeError("Receiver hostname not set yet. Cannot create " throw RuntimeError("Receiver hostname not set yet. Cannot create "
"rx_zmqip from none"); "rx_zmqip from none");
} }
@ -2624,7 +2624,7 @@ void slsDetector::setReceiverStreamingIP(std::string sourceIP) {
sls::strcpy_safe(detector_shm()->receiver_zmqip, retvals); sls::strcpy_safe(detector_shm()->receiver_zmqip, retvals);
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
receiver.close(); receiver.close();
ret = updateCachedReceiverVariables(); updateCachedReceiverVariables();
} }
} }
} }
@ -2680,7 +2680,7 @@ slsDetector::setAdditionalJsonHeader(const std::string &jsonheader) {
retvals); retvals);
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
ret = updateCachedReceiverVariables(); updateCachedReceiverVariables();
} }
return std::string(detector_shm()->receiver_additionalJsonHeader); return std::string(detector_shm()->receiver_additionalJsonHeader);
} }
@ -2703,7 +2703,7 @@ std::string slsDetector::getAdditionalJsonHeader() {
retvals); retvals);
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
ret = updateCachedReceiverVariables(); updateCachedReceiverVariables();
} }
return std::string(detector_shm()->receiver_additionalJsonHeader); return std::string(detector_shm()->receiver_additionalJsonHeader);
} }
@ -3279,7 +3279,7 @@ int slsDetector::setDeactivatedRxrPaddingMode(int padding) {
detector_shm()->receiver_deactivatedPaddingEnable = retval; detector_shm()->receiver_deactivatedPaddingEnable = retval;
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
ret = updateCachedReceiverVariables(); updateCachedReceiverVariables();
} }
return detector_shm()->receiver_deactivatedPaddingEnable; return detector_shm()->receiver_deactivatedPaddingEnable;
} }
@ -3315,7 +3315,7 @@ int slsDetector::setFlippedData(dimension d, int value) {
FILE_LOG(logDEBUG1) << "Flipped data:" << retval << " ret: " << ret; FILE_LOG(logDEBUG1) << "Flipped data:" << retval << " ret: " << ret;
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
ret = updateCachedReceiverVariables(); updateCachedReceiverVariables();
} }
return detector_shm()->flippedData[d]; return detector_shm()->flippedData[d];
} }
@ -3370,7 +3370,7 @@ int slsDetector::enableGapPixels(int val) {
} }
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
ret = updateCachedReceiverVariables(); updateCachedReceiverVariables();
} }
} }
return detector_shm()->gappixels; return detector_shm()->gappixels;
@ -3521,7 +3521,7 @@ int slsDetector::setStoragecellStart(int pos) {
FILE_LOG(logDEBUG1) << "Storage cell start: " << retval; FILE_LOG(logDEBUG1) << "Storage cell start: " << retval;
} }
if (ret == FORCE_UPDATE) { if (ret == FORCE_UPDATE) {
ret = updateDetector(); updateDetector();
} }
return retval; return retval;
} }