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

Merge branch 'tidywarning' into developer

Browse Source
This commit is contained in:
Erik Frojdh 2019-05-03 16:14:07 +02:00
commit e2f08da3e6
4 changed files with 75 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
.clang-tidy
View File

@ -18,8 +18,15 @@ Checks: '*,
-google-readability-todo, -google-readability-todo,
-google-readability-braces-around-statements' -google-readability-braces-around-statements'
WarningsAsErrors: '*' HeaderFilterRegex: \.h
HeaderFilterRegex: '.*'
AnalyzeTemporaryDtors: false AnalyzeTemporaryDtors: false
FormatStyle: none FormatStyle: none
CheckOptions:
- { key: readability-identifier-naming.NamespaceCase, value: lower_case }
- { key: readability-identifier-naming.FunctionCase, value: lower_case }
- { key: readability-identifier-naming.ClassCase, value: CamelCase }
- { key: readability-identifier-naming.MethodCase, value: CamelCase }
- { key: readability-identifier-naming.StructCase, value: CamelCase }
- { key: readability-identifier-naming.VariableCase, value: lower_case }
- { key: readability-identifier-naming.GlobalConstantCase, value: UPPER_CASE }
... ...

117
slsDetectorSoftware/src/multiSlsDetector.cpp
View File

@ -163,10 +163,10 @@ bool multiSlsDetector::isAcquireReady() {
FILE_LOG(logWARNING) << "Acquire has already started. " FILE_LOG(logWARNING) << "Acquire has already started. "
"If previous acquisition terminated unexpectedly, " "If previous acquisition terminated unexpectedly, "
"reset busy flag to restart.(sls_detector_put busy 0)"; "reset busy flag to restart.(sls_detector_put busy 0)";
return FAIL; return FAIL != 0u;
} }
multi_shm()->acquiringFlag = true; multi_shm()->acquiringFlag = true;
return OK; return OK != 0u;
} }
int multiSlsDetector::checkDetectorVersionCompatibility(int detPos) { int multiSlsDetector::checkDetectorVersionCompatibility(int detPos) {
@ -352,11 +352,11 @@ std::string multiSlsDetector::exec(const char *cmd) {
char buffer[bufsize]; char buffer[bufsize];
std::string result = ""; std::string result = "";
FILE *pipe = popen(cmd, "r"); FILE *pipe = popen(cmd, "r");
if (!pipe) { if (pipe == nullptr) {
throw RuntimeError("Could not open pipe"); throw RuntimeError("Could not open pipe");
} }
try { try {
while (!feof(pipe)) { while (feof(pipe) == 0) {
if (fgets(buffer, bufsize, pipe) != nullptr) { if (fgets(buffer, bufsize, pipe) != nullptr) {
result += buffer; result += buffer;
} }
@ -379,7 +379,7 @@ void multiSlsDetector::setHostname(const char *name, int detPos) {
// multi // multi
// this check is there only to allow the previous detsizechan command // this check is there only to allow the previous detsizechan command
if (multi_shm()->numberOfDetectors) { if (multi_shm()->numberOfDetectors != 0) {
FILE_LOG(logWARNING) << "There are already detector(s) in shared memory." FILE_LOG(logWARNING) << "There are already detector(s) in shared memory."
"Freeing Shared memory now."; "Freeing Shared memory now.";
freeSharedMemory(); freeSharedMemory();
@ -430,7 +430,7 @@ void multiSlsDetector::addSlsDetector(const std::string &hostname) {
multi_shm()->numberOfChannels += detectors[pos]->getTotalNumberOfChannels(); multi_shm()->numberOfChannels += detectors[pos]->getTotalNumberOfChannels();
detectors[pos]->setHostname(hostname); detectors[pos]->setHostname(hostname);
detectors[pos]->setOnline(true); detectors[pos]->setOnline(1);
} }
void multiSlsDetector::addSlsDetector(std::unique_ptr<slsDetector> det){ void multiSlsDetector::addSlsDetector(std::unique_ptr<slsDetector> det){
@ -800,9 +800,9 @@ int multiSlsDetector::writeConfigurationFile(const std::string &fname) {
++iline; ++iline;
// single detector configuration // single detector configuration
for (size_t idet = 0; idet < detectors.size(); ++idet) { for (auto & detector : detectors) {
outfile << std::endl; outfile << std::endl;
ret1 = detectors[idet]->writeConfigurationFile(outfile, this); ret1 = detector->writeConfigurationFile(outfile, this);
if (ret1 == FAIL) { if (ret1 == FAIL) {
ret = FAIL; ret = FAIL;
} }
@ -1720,11 +1720,11 @@ int multiSlsDetector::setNumberofUDPInterfaces(int n, int detPos) {
auto r = parallelCall(&slsDetector::setNumberofUDPInterfaces,n); auto r = parallelCall(&slsDetector::setNumberofUDPInterfaces,n);
// redo the zmq sockets // redo the zmq sockets
if (previouslyClientStreaming) { if (previouslyClientStreaming != 0) {
enableDataStreamingToClient(0); enableDataStreamingToClient(0);
enableDataStreamingToClient(1); enableDataStreamingToClient(1);
} }
if (previouslyReceiverStreaming) { if (previouslyReceiverStreaming != 0) {
enableDataStreamingFromReceiver(0); enableDataStreamingFromReceiver(0);
enableDataStreamingFromReceiver(1); enableDataStreamingFromReceiver(1);
} }
@ -1792,7 +1792,7 @@ void multiSlsDetector::setClientDataStreamingInPort(int i, int detPos) {
} }
} }
if (prev_streaming) { if (prev_streaming != 0) {
enableDataStreamingToClient(0); enableDataStreamingToClient(0);
enableDataStreamingToClient(1); enableDataStreamingToClient(1);
} }
@ -1832,7 +1832,7 @@ void multiSlsDetector::setReceiverDataStreamingOutPort(int i, int detPos) {
} }
} }
if (prev_streaming) { if (prev_streaming != 0) {
enableDataStreamingFromReceiver(0, detPos); enableDataStreamingFromReceiver(0, detPos);
enableDataStreamingFromReceiver(1, detPos); enableDataStreamingFromReceiver(1, detPos);
} }
@ -1851,7 +1851,7 @@ int multiSlsDetector::getReceiverStreamingPort(int detPos) {
} }
void multiSlsDetector::setClientDataStreamingInIP(const std::string &ip, int detPos) { void multiSlsDetector::setClientDataStreamingInIP(const std::string &ip, int detPos) {
if (ip.length()) { if (ip.length() != 0u) {
int prev_streaming = enableDataStreamingToClient(-1); int prev_streaming = enableDataStreamingToClient(-1);
// single // single
@ -1865,7 +1865,7 @@ void multiSlsDetector::setClientDataStreamingInIP(const std::string &ip, int det
} }
} }
if (prev_streaming) { if (prev_streaming != 0) {
enableDataStreamingToClient(0); enableDataStreamingToClient(0);
enableDataStreamingToClient(1); enableDataStreamingToClient(1);
} }
@ -1884,7 +1884,7 @@ std::string multiSlsDetector::getClientStreamingIP(int detPos) {
} }
void multiSlsDetector::setReceiverDataStreamingOutIP(const std::string &ip, int detPos) { void multiSlsDetector::setReceiverDataStreamingOutIP(const std::string &ip, int detPos) {
if (ip.length()) { if (ip.length() != 0u) {
int prev_streaming = enableDataStreamingFromReceiver(-1, detPos); int prev_streaming = enableDataStreamingFromReceiver(-1, detPos);
// single // single
@ -1898,7 +1898,7 @@ void multiSlsDetector::setReceiverDataStreamingOutIP(const std::string &ip, int
} }
} }
if (prev_streaming) { if (prev_streaming != 0) {
enableDataStreamingFromReceiver(0, detPos); enableDataStreamingFromReceiver(0, detPos);
enableDataStreamingFromReceiver(1, detPos); enableDataStreamingFromReceiver(1, detPos);
} }
@ -1973,7 +1973,7 @@ std::string multiSlsDetector::getAdditionalJsonParameter(const std::string &key,
} }
int multiSlsDetector::setDetectorMinMaxEnergyThreshold(const int index, int value, int detPos) { int multiSlsDetector::setDetectorMinMaxEnergyThreshold(const int index, int value, int detPos) {
std::string parameter = (index ? "emax" : "emin"); std::string parameter = (index != 0 ? "emax" : "emin");
std::string result; std::string result;
if (value < 0) { if (value < 0) {
@ -2315,8 +2315,8 @@ const slsDetectorDefs::ROI *multiSlsDetector::getROI(int &n, int detPos) {
// get each detector's roi array // get each detector's roi array
for (size_t idet = 0; idet < detectors.size(); ++idet) { for (size_t idet = 0; idet < detectors.size(); ++idet) {
temp = detectors[idet]->getROI(index); temp = detectors[idet]->getROI(index);
if (temp) { if (temp != nullptr) {
if (index) { if (index != 0) {
FILE_LOG(logINFO) << "detector " << idet << ":"; FILE_LOG(logINFO) << "detector " << idet << ":";
} }
for (int j = 0; j < index; ++j) { for (int j = 0; j < index; ++j) {
@ -2334,7 +2334,7 @@ const slsDetectorDefs::ROI *multiSlsDetector::getROI(int &n, int detPos) {
} }
// empty roi // empty roi
if (!n) { if (n == 0) {
return nullptr; return nullptr;
} }
@ -2496,7 +2496,7 @@ int multiSlsDetector::activate(int const enable, int detPos) {
int multiSlsDetector::setDeactivatedRxrPaddingMode(int padding, int detPos) { int multiSlsDetector::setDeactivatedRxrPaddingMode(int padding, int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->setDeactivatedRxrPaddingMode(padding); return static_cast<int>(detectors[detPos]->setDeactivatedRxrPaddingMode(padding));
} }
// multi // multi
@ -2938,14 +2938,14 @@ multiSlsDetector::setReceiverFramesDiscardPolicy(frameDiscardPolicy f, int detPo
int multiSlsDetector::setPartialFramesPadding(bool padding, int detPos) { int multiSlsDetector::setPartialFramesPadding(bool padding, int detPos) {
if (detPos >= 0) if (detPos >= 0)
return detectors[detPos]->setPartialFramesPadding(padding); return static_cast<int>(detectors[detPos]->setPartialFramesPadding(padding));
auto r = parallelCall(&slsDetector::setPartialFramesPadding, padding); auto r = parallelCall(&slsDetector::setPartialFramesPadding, padding);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
} }
int multiSlsDetector::getPartialFramesPadding(int detPos) const { int multiSlsDetector::getPartialFramesPadding(int detPos) const {
if (detPos >= 0) if (detPos >= 0)
return detectors[detPos]->getPartialFramesPadding(); return static_cast<int>(detectors[detPos]->getPartialFramesPadding());
auto r = parallelCall(&slsDetector::getPartialFramesPadding); auto r = parallelCall(&slsDetector::getPartialFramesPadding);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
} }
@ -3066,7 +3066,7 @@ int multiSlsDetector::getFramesCaughtByReceiver(int detPos) {
auto r = parallelCall(&slsDetector::getFramesCaughtByReceiver); auto r = parallelCall(&slsDetector::getFramesCaughtByReceiver);
// prevent divide by all or do not take avg when -1 for "did not connect" // prevent divide by all or do not take avg when -1 for "did not connect"
if ((!detectors.size()) || (sls::anyEqualTo(r, -1))) { if ((detectors.empty()) || (sls::anyEqualTo(r, -1))) {
return -1; return -1;
} }
@ -3084,7 +3084,7 @@ int multiSlsDetector::getReceiverCurrentFrameIndex(int detPos) {
auto r = parallelCall(&slsDetector::getReceiverCurrentFrameIndex); auto r = parallelCall(&slsDetector::getReceiverCurrentFrameIndex);
// prevent divide by all or do not take avg when -1 for "did not connect" // prevent divide by all or do not take avg when -1 for "did not connect"
if ((!detectors.size()) || (sls::anyEqualTo(r, -1))) { if ((detectors.empty()) || (sls::anyEqualTo(r, -1))) {
return -1; return -1;
} }
@ -3156,7 +3156,7 @@ void multiSlsDetector::readFrameFromReceiver() {
if (getDetectorTypeAsEnum() == EIGER) { if (getDetectorTypeAsEnum() == EIGER) {
eiger = true; eiger = true;
nX *= 2; nX *= 2;
gappixelsenable = detectors[0]->enableGapPixels(-1) >= 1 ? true : false; gappixelsenable = detectors[0]->enableGapPixels(-1) > 0;
} }
if (getNumberofUDPInterfaces() == 2) { if (getNumberofUDPInterfaces() == 2) {
nY *= 2; nY *= 2;
@ -3165,7 +3165,7 @@ void multiSlsDetector::readFrameFromReceiver() {
bool runningList[zmqSocket.size()], connectList[zmqSocket.size()]; bool runningList[zmqSocket.size()], connectList[zmqSocket.size()];
int numRunning = 0; int numRunning = 0;
for (size_t i = 0; i < zmqSocket.size(); ++i) { for (size_t i = 0; i < zmqSocket.size(); ++i) {
if (!zmqSocket[i]->Connect()) { if (zmqSocket[i]->Connect() == 0) {
connectList[i] = true; connectList[i] = true;
runningList[i] = true; runningList[i] = true;
++numRunning; ++numRunning;
@ -3214,8 +3214,8 @@ void multiSlsDetector::readFrameFromReceiver() {
// HEADER // HEADER
{ {
rapidjson::Document doc; rapidjson::Document doc;
if (!zmqSocket[isocket]->ReceiveHeader(isocket, doc, if (zmqSocket[isocket]->ReceiveHeader(isocket, doc,
SLS_DETECTOR_JSON_HEADER_VERSION)) { SLS_DETECTOR_JSON_HEADER_VERSION) == 0) {
// parse error, version error or end of acquisition for // parse error, version error or end of acquisition for
// socket // socket
runningList[isocket] = false; runningList[isocket] = false;
@ -3286,7 +3286,7 @@ void multiSlsDetector::readFrameFromReceiver() {
<< "\n\tsingledetrowoffset: " << singledetrowoffset << "\n\tsingledetrowoffset: " << singledetrowoffset
<< "\n\trowoffset: " << rowoffset; << "\n\trowoffset: " << rowoffset;
if (eiger && flippedDataX) { if (eiger && (flippedDataX != 0u)) {
for (uint32_t i = 0; i < nPixelsY; ++i) { for (uint32_t i = 0; i < nPixelsY; ++i) {
memcpy(((char *)multiframe) + memcpy(((char *)multiframe) +
((yoffset + (nPixelsY - 1 - i)) * rowoffset) + xoffset, ((yoffset + (nPixelsY - 1 - i)) * rowoffset) + xoffset,
@ -3326,7 +3326,7 @@ void multiSlsDetector::readFrameFromReceiver() {
} }
// all done // all done
if (!numRunning) { if (numRunning == 0) {
// let main thread know that all dummy packets have been received // let main thread know that all dummy packets have been received
//(also from external process), //(also from external process),
// main thread can now proceed to measurement finished call back // main thread can now proceed to measurement finished call back
@ -3389,7 +3389,7 @@ int multiSlsDetector::processImageWithGapPixels(char *image, char *&gpImage) {
memcpy(dst, src, b1chipx); memcpy(dst, src, b1chipx);
src += b1chipx; src += b1chipx;
dst += b1chipx; dst += b1chipx;
if ((col + 1) % 4) { if (((col + 1) % 4) != 0) {
++dst; ++dst;
} }
} }
@ -3409,7 +3409,7 @@ int multiSlsDetector::processImageWithGapPixels(char *image, char *&gpImage) {
dst += b1chipx; dst += b1chipx;
mod = (col + 1) % 4; mod = (col + 1) % 4;
// copy gap pixel(chip 0, 1, 2) // copy gap pixel(chip 0, 1, 2)
if (mod) { if (mod != 0) {
// neighbouring gap pixels to left // neighbouring gap pixels to left
temp = (*((uint8_t *)(dst - 1))); temp = (*((uint8_t *)(dst - 1)));
g1 = ((temp & 0xF) / 2); g1 = ((temp & 0xF) / 2);
@ -3483,7 +3483,7 @@ int multiSlsDetector::processImageWithGapPixels(char *image, char *&gpImage) {
int multiSlsDetector::setFileWrite(bool value, int detPos) { int multiSlsDetector::setFileWrite(bool value, int detPos) {
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->setFileWrite(value); return static_cast<int>(detectors[detPos]->setFileWrite(value));
} }
auto r = parallelCall(&slsDetector::setFileWrite, value); auto r = parallelCall(&slsDetector::setFileWrite, value);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
@ -3491,7 +3491,7 @@ int multiSlsDetector::setFileWrite(bool value, int detPos) {
int multiSlsDetector::getFileWrite(int detPos) const{ int multiSlsDetector::getFileWrite(int detPos) const{
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->getFileWrite(); return static_cast<int>(detectors[detPos]->getFileWrite());
} }
auto r = parallelCall(&slsDetector::getFileWrite); auto r = parallelCall(&slsDetector::getFileWrite);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
@ -3499,7 +3499,7 @@ int multiSlsDetector::getFileWrite(int detPos) const{
int multiSlsDetector::setMasterFileWrite(bool value, int detPos) { int multiSlsDetector::setMasterFileWrite(bool value, int detPos) {
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->setMasterFileWrite(value); return static_cast<int>(detectors[detPos]->setMasterFileWrite(value));
} }
auto r = parallelCall(&slsDetector::setMasterFileWrite, value); auto r = parallelCall(&slsDetector::setMasterFileWrite, value);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
@ -3507,7 +3507,7 @@ int multiSlsDetector::setMasterFileWrite(bool value, int detPos) {
int multiSlsDetector::getMasterFileWrite(int detPos) const{ int multiSlsDetector::getMasterFileWrite(int detPos) const{
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->getMasterFileWrite(); return static_cast<int>(detectors[detPos]->getMasterFileWrite());
} }
auto r = parallelCall(&slsDetector::getMasterFileWrite); auto r = parallelCall(&slsDetector::getMasterFileWrite);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
@ -3515,7 +3515,7 @@ int multiSlsDetector::getMasterFileWrite(int detPos) const{
int multiSlsDetector::setFileOverWrite(bool enable, int detPos) { int multiSlsDetector::setFileOverWrite(bool enable, int detPos) {
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->setFileOverWrite(enable); return static_cast<int>(detectors[detPos]->setFileOverWrite(enable));
} }
auto r = parallelCall(&slsDetector::setFileOverWrite, enable); auto r = parallelCall(&slsDetector::setFileOverWrite, enable);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
@ -3523,7 +3523,7 @@ int multiSlsDetector::setFileOverWrite(bool enable, int detPos) {
int multiSlsDetector::getFileOverWrite(int detPos) const { int multiSlsDetector::getFileOverWrite(int detPos) const {
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->getFileOverWrite(); return static_cast<int>(detectors[detPos]->getFileOverWrite());
} }
auto r = parallelCall(&slsDetector::getFileOverWrite); auto r = parallelCall(&slsDetector::getFileOverWrite);
return sls::minusOneIfDifferent(r); return sls::minusOneIfDifferent(r);
@ -3554,7 +3554,7 @@ int multiSlsDetector::setReceiverStreamingTimer(int time_in_ms, int detPos) {
int multiSlsDetector::enableDataStreamingToClient(int enable) { int multiSlsDetector::enableDataStreamingToClient(int enable) {
if (enable >= 0) { if (enable >= 0) {
// destroy data threads // destroy data threads
if (!enable) { if (enable == 0) {
createReceivingDataSockets(true); createReceivingDataSockets(true);
// create data threads // create data threads
} else { } else {
@ -3563,13 +3563,13 @@ int multiSlsDetector::enableDataStreamingToClient(int enable) {
} }
} }
} }
return client_downstream; return static_cast<int>(client_downstream);
} }
int multiSlsDetector::enableDataStreamingFromReceiver(int enable, int detPos) { int multiSlsDetector::enableDataStreamingFromReceiver(int enable, int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->enableDataStreamingFromReceiver(enable); return static_cast<int>(detectors[detPos]->enableDataStreamingFromReceiver(enable));
} }
// multi // multi
@ -3602,7 +3602,7 @@ int multiSlsDetector::setReceiverFifoDepth(int i, int detPos) {
int multiSlsDetector::setReceiverSilentMode(int i, int detPos) { int multiSlsDetector::setReceiverSilentMode(int i, int detPos) {
// single // single
if (detPos >= 0) { if (detPos >= 0) {
return detectors[detPos]->setReceiverSilentMode(i); return static_cast<int>(detectors[detPos]->setReceiverSilentMode(i));
} }
// multi // multi
@ -3621,7 +3621,7 @@ int multiSlsDetector::setPattern(const std::string &fname, int detPos) {
} else { } else {
int addr{0}; int addr{0};
uint64_t word{0}; uint64_t word{0};
while (fread(&word, sizeof(word), 1, fd)) { while (fread(&word, sizeof(word), 1, fd) != 0u) {
serialCall(&slsDetector::setPatternWord, addr, word); serialCall(&slsDetector::setPatternWord, addr, word);
++addr; ++addr;
} }
@ -3986,7 +3986,7 @@ void multiSlsDetector::registerDataCallback(int (*userCallback)(detectorData *,
int multiSlsDetector::setTotalProgress() { int multiSlsDetector::setTotalProgress() {
int nf = 1, nc = 1, ns = 1, nm = 1; int nf = 1, nc = 1, ns = 1, nm = 1;
if (multi_shm()->timerValue[FRAME_NUMBER]) { if (multi_shm()->timerValue[FRAME_NUMBER] != 0) {
nf = multi_shm()->timerValue[FRAME_NUMBER]; nf = multi_shm()->timerValue[FRAME_NUMBER];
} }
@ -4032,7 +4032,7 @@ void multiSlsDetector::setCurrentProgress(int i) {
int multiSlsDetector::acquire() { int multiSlsDetector::acquire() {
// ensure acquire isnt started multiple times by same client // ensure acquire isnt started multiple times by same client
if (isAcquireReady() == FAIL) { if (static_cast<int>(isAcquireReady()) == FAIL) {
return FAIL; return FAIL;
} }
@ -4079,7 +4079,7 @@ int multiSlsDetector::acquire() {
// loop through measurements // loop through measurements
for (int im = 0; im < nm; ++im) { for (int im = 0; im < nm; ++im) {
if (multi_shm()->stoppedFlag) { if (multi_shm()->stoppedFlag != 0) {
break; break;
} }
@ -4104,7 +4104,7 @@ int multiSlsDetector::acquire() {
if (stopReceiver() == FAIL) { if (stopReceiver() == FAIL) {
multi_shm()->stoppedFlag = 1; multi_shm()->stoppedFlag = 1;
} else { } else {
if (dataReady) { if (dataReady != nullptr) {
sem_wait(&sem_endRTAcquisition); // waits for receiver's sem_wait(&sem_endRTAcquisition); // waits for receiver's
} }
// external process to be // external process to be
@ -4114,10 +4114,10 @@ int multiSlsDetector::acquire() {
int findex = 0; int findex = 0;
findex = incrementFileIndex(); findex = incrementFileIndex();
if (measurement_finished) { if (measurement_finished != nullptr) {
measurement_finished(im, findex, measFinished_p); measurement_finished(im, findex, measFinished_p);
} }
if (multi_shm()->stoppedFlag) { if (multi_shm()->stoppedFlag != 0) {
break; break;
} }
@ -4128,11 +4128,11 @@ int multiSlsDetector::acquire() {
sem_post(&sem_newRTAcquisition); sem_post(&sem_newRTAcquisition);
dataProcessingThread.join(); dataProcessingThread.join();
if (progress_call) { if (progress_call != nullptr) {
progress_call(getCurrentProgress(), pProgressCallArg); progress_call(getCurrentProgress(), pProgressCallArg);
} }
if (acquisition_finished) { if (acquisition_finished != nullptr) {
acquisition_finished(getCurrentProgress(), getRunStatus(), acqFinished_p); acquisition_finished(getCurrentProgress(), getRunStatus(), acqFinished_p);
} }
@ -4160,7 +4160,7 @@ void multiSlsDetector::processData() {
if (setReceiverOnline() == OFFLINE_FLAG) { if (setReceiverOnline() == OFFLINE_FLAG) {
return; return;
} else { } else {
if (dataReady) { if (dataReady != nullptr) {
readFrameFromReceiver(); readFrameFromReceiver();
} }
// only update progress // only update progress
@ -4192,7 +4192,6 @@ void multiSlsDetector::processData() {
} }
} }
} }
return;
} }
bool multiSlsDetector::getJoinThreadFlag() const { bool multiSlsDetector::getJoinThreadFlag() const {
@ -4224,7 +4223,7 @@ std::vector<char> multiSlsDetector::readPofFile(const std::string &fname) {
// check if it exists // check if it exists
struct stat st; struct stat st;
if (stat(fname.c_str(), &st)) { if (stat(fname.c_str(), &st) != 0) {
throw RuntimeError("Program FPGA: Programming file does not exist"); throw RuntimeError("Program FPGA: Programming file does not exist");
} }
@ -4278,10 +4277,10 @@ std::vector<char> multiSlsDetector::readPofFile(const std::string &fname) {
throw RuntimeError("Could not convert programming file. EOF before end of flash"); throw RuntimeError("Could not convert programming file. EOF before end of flash");
} }
} }
if (fclose(src)) { if (fclose(src) != 0) {
throw RuntimeError("Program FPGA: Could not close source file"); throw RuntimeError("Program FPGA: Could not close source file");
} }
if (close(dst)) { if (close(dst) != 0) {
throw RuntimeError("Program FPGA: Could not close destination file"); throw RuntimeError("Program FPGA: Could not close destination file");
} }
FILE_LOG(logDEBUG1) << "File has been converted to " << destfname; FILE_LOG(logDEBUG1) << "File has been converted to " << destfname;
@ -4291,7 +4290,7 @@ std::vector<char> multiSlsDetector::readPofFile(const std::string &fname) {
if (fp == nullptr) { if (fp == nullptr) {
throw RuntimeError("Program FPGA: Could not open rawbin file"); throw RuntimeError("Program FPGA: Could not open rawbin file");
} }
if (fseek(fp, 0, SEEK_END)) { if (fseek(fp, 0, SEEK_END) != 0) {
throw RuntimeError("Program FPGA: Seek error in rawbin file"); throw RuntimeError("Program FPGA: Seek error in rawbin file");
} }
filesize = ftell(fp); filesize = ftell(fp);
@ -4305,7 +4304,7 @@ std::vector<char> multiSlsDetector::readPofFile(const std::string &fname) {
throw RuntimeError("Program FPGA: Could not read rawbin file"); throw RuntimeError("Program FPGA: Could not read rawbin file");
} }
if (fclose(fp)) { if (fclose(fp) != 0) {
throw RuntimeError("Program FPGA: Could not close destination file after converting"); throw RuntimeError("Program FPGA: Could not close destination file after converting");
} }
unlink(destfname); // delete temporary file unlink(destfname); // delete temporary file

10
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -587,13 +587,13 @@ void slsDetector::updateTotalNumberOfChannels() {
int adatabytes = 0, ddatabytes = 0; int adatabytes = 0, ddatabytes = 0;
// analog channels (normal, analog/digital readout) // analog channels (normal, analog/digital readout)
if (shm()->roFlags == slsDetectorDefs::NORMAL_READOUT || if (shm()->roFlags == slsDetectorDefs::NORMAL_READOUT ||
shm()->roFlags & slsDetectorDefs::ANALOG_AND_DIGITAL) { ((shm()->roFlags & slsDetectorDefs::ANALOG_AND_DIGITAL) != 0)) {
uint32_t mask = shm()->adcEnableMask; uint32_t mask = shm()->adcEnableMask;
if (mask == BIT32_MASK) { if (mask == BIT32_MASK) {
nachans = 32; nachans = 32;
} else { } else {
for (int ich = 0; ich < 32; ++ich) { for (int ich = 0; ich < 32; ++ich) {
if (mask & (1 << ich)) if ((mask & (1 << ich)) != 0u)
++nachans; ++nachans;
} }
} }
@ -605,7 +605,7 @@ void slsDetector::updateTotalNumberOfChannels() {
// digital channels (ctb only, digital, analog/digital readout) // digital channels (ctb only, digital, analog/digital readout)
if (shm()->myDetectorType == CHIPTESTBOARD && if (shm()->myDetectorType == CHIPTESTBOARD &&
((shm()->roFlags & DIGITAL_ONLY) || (shm()->roFlags & ANALOG_AND_DIGITAL))) { (((shm()->roFlags & DIGITAL_ONLY) != 0) || ((shm()->roFlags & ANALOG_AND_DIGITAL) != 0))) {
ndchans = 64; ndchans = 64;
ddatabytes = (sizeof(uint64_t) * shm()->timerValue[DIGITAL_SAMPLES]); ddatabytes = (sizeof(uint64_t) * shm()->timerValue[DIGITAL_SAMPLES]);
FILE_LOG(logDEBUG1) << "#Digital Channels:" << ndchans FILE_LOG(logDEBUG1) << "#Digital Channels:" << ndchans
@ -1478,10 +1478,10 @@ int slsDetector::configureMAC() {
ret = client.sendCommandThenRead(fnum, args, sizeof(args), retvals, ret = client.sendCommandThenRead(fnum, args, sizeof(args), retvals,
sizeof(retvals)); sizeof(retvals));
//TODO!(Erik) Send as int already from detector
uint64_t detector_mac = 0; uint64_t detector_mac = 0;
uint32_t detector_ip = 0; uint32_t detector_ip = 0;
sscanf(retvals[0], "%lx", sscanf(retvals[0], "%lx", &detector_mac);
&detector_mac); // TODO! (Erik) send mac and ip as int
sscanf(retvals[1], "%x", &detector_ip); sscanf(retvals[1], "%x", &detector_ip);
detector_ip = __builtin_bswap32(detector_ip); detector_ip = __builtin_bswap32(detector_ip);

7
slsDetectorSoftware/tests/test-multiSlsDetector.cpp
View File

@ -57,7 +57,6 @@ SCENARIO("Multi detector operation", "[detector]") {
} }
} }
} }
m.freeSharedMemory(); m.freeSharedMemory();
} }
} }
@ -71,13 +70,13 @@ TEST_CASE("Set and get partialFramesPadding", "[detector][somenewtag]"){
m.addSlsDetector(sls::make_unique<slsDetector>( m.addSlsDetector(sls::make_unique<slsDetector>(
slsDetectorDefs::detectorType::EIGER, 20, 1)); slsDetectorDefs::detectorType::EIGER, 20, 1));
m.setPartialFramesPadding(0); m.setPartialFramesPadding(false);
CHECK(m.getPartialFramesPadding() == 0); CHECK(m.getPartialFramesPadding() == 0);
m.setPartialFramesPadding(1); m.setPartialFramesPadding(true);
CHECK(m.getPartialFramesPadding() == 1); CHECK(m.getPartialFramesPadding() == 1);
m.setPartialFramesPadding(0, 0); m.setPartialFramesPadding(false, 0);
CHECK(m.getPartialFramesPadding() == -1); CHECK(m.getPartialFramesPadding() == -1);
m.freeSharedMemory(); m.freeSharedMemory();