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

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

Browse Source
This commit is contained in:
bergamaschi 2019-06-04 08:48:58 +02:00
commit 1a2e252665
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/src/slsDetectorCommand.cpp
View File

@ -632,9 +632,9 @@ slsDetectorCommand::slsDetectorCommand(multiSlsDetector *det) {
++i; ++i;
/*! \page timing /*! \page timing
- <b>bsamples [i]</b> sets/gets number of digital samples expected from the ctb. Used in CHIP TEST BOARD and MOENCH only. \c Returns \c (long long int) - <b>dsamples [i]</b> sets/gets number of digital samples expected from the ctb. Used in CHIP TEST BOARD and MOENCH only. \c Returns \c (long long int)
*/ */
descrToFuncMap[i].m_pFuncName = "bsamples"; descrToFuncMap[i].m_pFuncName = "dsamples";
descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimer; descrToFuncMap[i].m_pFuncPtr = &slsDetectorCommand::cmdTimer;
++i; ++i;
@ -4468,7 +4468,7 @@ std::string slsDetectorCommand::cmdTimer(int narg, const char * const args[], in
index = ANALOG_SAMPLES; index = ANALOG_SAMPLES;
else if (cmd == "asamples") else if (cmd == "asamples")
index = ANALOG_SAMPLES; index = ANALOG_SAMPLES;
else if (cmd == "bsamples") else if (cmd == "dsamples")
index = DIGITAL_SAMPLES; index = DIGITAL_SAMPLES;
else if (cmd == "storagecells") else if (cmd == "storagecells")
index = STORAGE_CELL_NUMBER; index = STORAGE_CELL_NUMBER;