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

ctb adc: get in uV and print in client in mV to get decimals

Browse Source
This commit is contained in:
maliakal_d
2020-02-27 15:43:42 +01:00
parent 10ba16a9dc
commit 2e2e91b219
5 changed files with 21 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
slsDetectorSoftware/include/Detector.h
View File

@ -1036,7 +1036,7 @@ class Detector {
Result<int> getMeasuredCurrent(defs::dacIndex index,
Positions pos = {}) const;
/** [CTB] Options: SLOW_ADC0 - SLOW_ADC7 in mV */
/** [CTB] Options: SLOW_ADC0 - SLOW_ADC7 in uV */
Result<int> getSlowADC(defs::dacIndex index, Positions pos = {}) const;
/** [CTB]*/

6
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -1416,7 +1416,11 @@ std::string CmdProxy::SlowAdc(int action) {
} else {
auto t = det->getSlowADC(
static_cast<defs::dacIndex>(nchan + defs::SLOW_ADC0), {det_id});
os << OutString(t) << " mV\n";
Result<double> result(t.size());
for (unsigned int i = 0; i < t.size(); ++i) {
result[i] = t[i] / 1000.00;
}
os << OutString(result) << " mV\n";
}
} else if (action == defs::PUT_ACTION) {
throw sls::RuntimeError("cannot put");