diff --git a/slsDetectorSoftware/src/slsDetectorCommand.cpp b/slsDetectorSoftware/src/slsDetectorCommand.cpp index b4d19f535..726dac855 100755 --- a/slsDetectorSoftware/src/slsDetectorCommand.cpp +++ b/slsDetectorSoftware/src/slsDetectorCommand.cpp @@ -690,14 +690,14 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { ++i; /*! \page config - - framesl gets number of frames left. Used in GOTTHARD and Jungfrau only. Only get! \c Returns \c (double with 9 decimal digits) + - framesl gets number of frames left. Used in GOTTHARD and Jungfrau only. Only get! \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName = "framesl"; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimeLeft; ++i; /*! \page timing - - cyclesl gets number of cylces left. Used in GOTTHARD and Jungfrau only. Only get! \c Returns \c (double with 9 decimal digits) + - cyclesl gets number of cylces left. Used in GOTTHARD and Jungfrau only. Only get! \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName = "cyclesl"; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimeLeft; @@ -718,7 +718,7 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) { ++i; /*! \page timing - - nframes Frames from start run control. Only Jungfrau. Only get! + - nframes Frames from start run control. Only Jungfrau. Only get! \c Returns \c (long long int) */ descrToFuncMap[i].m_pFuncName = "nframes"; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimeLeft; @@ -4642,12 +4642,13 @@ std::string slsDetectorCommand::cmdTimeLeft(int narg, const char * const args[], ret = myDet->getTimeLeft(index, detPos); if ((ret != -1) && (index == ACQUISITION_TIME || index == FRAME_PERIOD || index == DELAY_AFTER_TRIGGER || index == ACTUAL_TIME || index == MEASUREMENT_TIME || - index == MEASURED_PERIOD || index == MEASURED_SUBPERIOD)) + index == MEASURED_PERIOD || index == MEASURED_SUBPERIOD)) { rval = (double)ret * 1E-9; - else - rval = ret; + sprintf(answer,"%0.9f",rval); + } else { + sprintf(answer,"%lld",(long long int)ret); + } - sprintf(answer, "%0.9f", rval); return std::string(answer); }