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

Merge branch 'developer' into gui

Browse Source
This commit is contained in:
maliakal_d 2019-07-12 10:36:54 +02:00
commit 5e24591295
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

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