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

removed minor warnings

Browse Source
This commit is contained in:
maliakal_d 2019-02-08 16:32:23 +01:00
parent 046fb11e5e
commit 3c77447868
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -604,7 +604,7 @@ int64_t multiSlsDetector::getId(idMode mode, int imod) {
slsDetector* multiSlsDetector::getSlsDetector(unsigned int pos) { slsDetector* multiSlsDetector::getSlsDetector(unsigned int pos) {
if (pos >= 0 && pos < detectors.size()) { if (pos < detectors.size()) {
return detectors[pos]; return detectors[pos];
} }
return 0; return 0;
@ -2343,7 +2343,7 @@ int multiSlsDetector::sendSoftwareTrigger() {
int multiSlsDetector::startReadOut() { int multiSlsDetector::startReadOut() {
unsigned int i = 0; int i = 0;
int ret = OK, ret1 = OK; int ret = OK, ret1 = OK;
i = thisMultiDetector->masterPosition; i = thisMultiDetector->masterPosition;
if (i >= 0) { if (i >= 0) {
@ -2353,7 +2353,7 @@ int multiSlsDetector::startReadOut() {
if (ret != OK) if (ret != OK)
ret1 = FAIL; ret1 = FAIL;
} }
for (i = 0; i < detectors.size(); ++i) { for (i = 0; i < (int)detectors.size(); ++i) {
ret = detectors[i]->startReadOut(); ret = detectors[i]->startReadOut();
if (detectors[i]->getErrorMask()) if (detectors[i]->getErrorMask())
setErrorMask(getErrorMask() | (1 << i)); setErrorMask(getErrorMask() | (1 << i));

3
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5355,12 +5355,13 @@ string slsDetector::setReceiverUDPMAC(string udpmac) {
if((udpmac[2]==':')&&(udpmac[5]==':')&&(udpmac[8]==':')&& if((udpmac[2]==':')&&(udpmac[5]==':')&&(udpmac[8]==':')&&
(udpmac[11]==':')&&(udpmac[14]==':')){ (udpmac[11]==':')&&(udpmac[14]==':')){
strcpy(thisDetector->receiverUDPMAC,udpmac.c_str()); strcpy(thisDetector->receiverUDPMAC,udpmac.c_str());
if(!strcmp(thisDetector->receiver_hostname,"none")) if(!strcmp(thisDetector->receiver_hostname,"none")) {
#ifdef VERBOSE #ifdef VERBOSE
std::cout << "Warning: Receiver hostname not set yet." << endl; std::cout << "Warning: Receiver hostname not set yet." << endl;
#else #else
; ;
#endif #endif
}
/* else if(setUDPConnection()==FAIL){ commented out to be replaced by user /* else if(setUDPConnection()==FAIL){ commented out to be replaced by user
* defined udpmac * defined udpmac
std::cout<< "Warning: UDP connection set up failed" << std::endl; std::cout<< "Warning: UDP connection set up failed" << std::endl;

2
slsReceiverSoftware/include/logger.h
View File

@ -115,7 +115,7 @@ inline std::string NowTime()
const int buffer_len = sizeof(buffer); const int buffer_len = sizeof(buffer);
time_t t; time_t t;
time(&t); time(&t);
tm r = {}; tm r;
strftime(buffer, buffer_len, "%X", localtime_r(&t, &r)); strftime(buffer, buffer_len, "%X", localtime_r(&t, &r));
buffer[buffer_len - 1] = 0; buffer[buffer_len - 1] = 0;
struct timeval tv; struct timeval tv;