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

sending and writing subexptime in the receiver files, adding 0x in front of all numbers printed in command line which is hexa

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-08-10 17:25:28 +02:00
parent 11943c4b5c
commit ad3e3ce255
12 changed files with 76 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsReceiverSoftware/src/slsReceiverTCPIPInterface.cpp
View File

@ -999,6 +999,9 @@ int slsReceiverTCPIPInterface::set_timer() {
case CYCLES_NUMBER:
receiverBase->setNumberOfFrames(index[1]);
break;
case SUBFRAME_ACQUISITION_TIME:
receiverBase->setSubExpTime(index[1]);
break;
default:
ret = FAIL;
sprintf(mess,"This timer mode (%lld) does not exist for receiver\n", (long long int)index[0]);
@ -1018,7 +1021,15 @@ int slsReceiverTCPIPInterface::set_timer() {
case CYCLES_NUMBER:
retval=receiverBase->getNumberOfFrames();
break;
case SUBFRAME_ACQUISITION_TIME:
retval=receiverBase->getSubExpTime();
break;
default:
ret = FAIL;
sprintf(mess,"This timer mode (%lld) does not exist for receiver\n", (long long int)index[0]);
FILE_LOG(logERROR) << "Warning: " << mess;
}
// check
if (ret == OK && index[1] >= 0 && retval != index[1]) {
ret = FAIL;
@ -1028,12 +1039,7 @@ int slsReceiverTCPIPInterface::set_timer() {
}
#endif
#ifdef VERYVERBOSE
if (index[0] == ACQUISITION_TIME)
FILE_LOG(logDEBUG1) << "acquisition time:" << retval;
else if(index[0] == FRAME_PERIOD)
FILE_LOG(logDEBUG1) << "acquisition period:" << retval
else
FILE_LOG(logDEBUG1) << "frame number:" << retval;
FILE_LOG(logDEBUG1) << getTimerType(index[0]) << ":" << retval;
#endif
if (ret == OK && mySock->differentClients)