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

Merge branch 'refactor' of github.com:slsdetectorgroup/slsDetectorPackage into refactor

Browse Source
This commit is contained in:
maliakal_d 2019-02-21 16:25:07 +01:00
commit 40d15264c5
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -4397,7 +4397,7 @@ std::string slsDetectorCommand::cmdTimeLeft(int narg, char *args[], int action,
ret = myDet->getTimeLeft(index, detPos);
if ((ret != -1) && (index == ACQUISITION_TIME || index == FRAME_PERIOD || index == DELAY_AFTER_TRIGGER || index == ACTUAL_TIME || index == MEASUREMENT_TIME ||
MEASURED_PERIOD || MEASURED_SUBPERIOD))
index == MEASURED_PERIOD || index == MEASURED_SUBPERIOD))
rval = (double)ret * 1E-9;
else
rval = ret;

2
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -421,7 +421,7 @@ int slsReceiverTCPIPInterface::set_port() {
try {
mySocket = new MySocketTCP(p_number);
strcpy(mySock->lastClientIP,oldLastClientIP);
} catch(SamePortSocketException e) {
} catch(SamePortSocketException &e) {
ret = FAIL;
sprintf(mess, "Could not bind port %d. It is already set\n", p_number);
FILE_LOG(logERROR) << mess;