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

Merge branch '3.0-rc' of git.psi.ch:sls_detectors_software/sls_detector_software into 3.0-rc

Browse Source
This commit is contained in:
bergamaschi
2017-08-17 17:04:57 +02:00
parent be95de0963 355c0a8c11
commit ff7b6c5abe
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/slsDetector/slsDetectorCommand.cpp
View File

@ -1451,7 +1451,7 @@ slsDetectorCommand::slsDetectorCommand(slsDetectorUtils *det) {
- <b>temp_10ge</b> Gets the 10Gbe temperature. Used in EIGER only. \c Returns \c EIGER(double"°C") - <b>temp_10ge</b> Gets the 10Gbe temperature. Used in EIGER only. \c Returns \c EIGER(double"°C")
*/ */
descrToFuncMap[i].m_pFuncName="temp_10ge"; // descrToFuncMap[i].m_pFuncName="temp_10ge"; //
descrToFuncMap[i].m_pFuncPtr. \c Returns \c (int ["mV"])etectorCommand::cmdADC; descrToFuncMap[i].m_pFuncPtr=&slsDetectorCommand::cmdADC;
i++; i++;
/*! \page settings /*! \page settings