merge developer

This commit is contained in:
Dhanya Maliakal
2017-07-03 17:42:06 +02:00
6 changed files with 23 additions and 28 deletions

View File

@ -929,7 +929,7 @@ class multiSlsDetector : public slsDetectorUtils {
\param val value (in V)
\param index DAC index
\param imod module number (if -1 alla modules)
\returns current DAC value
\returns current DAC value (temperature for eiger and jungfrau in millidegrees)
*/
dacs_t getADC(dacIndex index, int imod=-1);
/**