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

nios temp (#557)

Browse Source 
* fixed temp read nios

* divide for eiger and dont print
This commit is contained in:
Dhanya Thattil
2022-10-18 15:47:23 +02:00
committed by GitHub
parent 4a7cd051c1
commit 46bb9bc2d7
22 changed files with 171 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1450,9 +1450,10 @@ class CmdProxy {
GET_IND_COMMAND(temp_adc, getTemperature, slsDetectorDefs::TEMPERATURE_ADC,
" °C", "[n_value]\n\t[Jungfrau][Gotthard] ADC Temperature");
GET_IND_COMMAND(
temp_fpga, getTemperature, slsDetectorDefs::TEMPERATURE_FPGA, " °C",
"[n_value]\n\t[Eiger][Jungfrau][Gotthard] FPGA Temperature");
GET_IND_COMMAND(temp_fpga, getTemperature,
slsDetectorDefs::TEMPERATURE_FPGA, " °C",
"[n_value]\n\t[Eiger][Jungfrau][Gotthard][Mythen3]["
"Gotthard2] FPGA Temperature");
GET_IND_COMMAND(temp_fpgaext, getTemperature,
slsDetectorDefs::TEMPERATURE_FPGAEXT, " °C",

5
slsDetectorSoftware/src/Detector.cpp
View File

@ -605,6 +605,9 @@ std::vector<defs::dacIndex> Detector::getTemperatureList() const {
defs::TEMPERATURE_10GE, defs::TEMPERATURE_DCDC,
defs::TEMPERATURE_SODL, defs::TEMPERATURE_SODR,
defs::TEMPERATURE_FPGA2, defs::TEMPERATURE_FPGA3};
case defs::MYTHEN3:
case defs::GOTTHARD2:
return std::vector<defs::dacIndex>{defs::TEMPERATURE_FPGA};
default:
return std::vector<defs::dacIndex>{};
}
@ -631,6 +634,8 @@ Result<int> Detector::getTemperature(defs::dacIndex index,
switch (getDetectorType().squash()) {
case defs::EIGER:
case defs::JUNGFRAU:
case defs::MYTHEN3:
case defs::GOTTHARD2:
for (auto &it : res) {
it /= 1000;
}