diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index 5bf4f1cfd..7cf67d811 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -364,9 +364,7 @@ class Detector { * [Jungfrau] Options: TEMPERATURE_ADC, TEMPERATURE_FPGA \n * [Eiger] Options: TEMPERATURE_FPGA, TEMPERATURE_FPGAEXT, TEMPERATURE_10GE, * TEMPERATURE_DCDC, TEMPERATURE_SODL, TEMPERATURE_SODR, TEMPERATURE_FPGA2, - * TEMPERATURE_FPGA3 \n - * Cannot call TEMPERATURE_FPGA2 and TEMPERATURE_FPGA3 when blocking acquire - * in progress \n [CTB] Options: SLOW_ADC_TEMP + * TEMPERATURE_FPGA3 \n [CTB] Options: SLOW_ADC_TEMP */ Result getTemperature(defs::dacIndex index, Positions pos = {}) const; diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index cd66a3a2d..4e71d8815 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -1350,13 +1350,11 @@ class CmdProxy { GET_IND_COMMAND( temp_fpgafl, getTemperature, slsDetectorDefs::TEMPERATURE_FPGA2, " °C", - "[n_value]\n\t[Eiger]Temperature of the left front end board fpga. " - "Cannot call this while blocking acquire is going on."); + "[n_value]\n\t[Eiger]Temperature of the left front end board fpga."); GET_IND_COMMAND( temp_fpgafr, getTemperature, slsDetectorDefs::TEMPERATURE_FPGA3, " °C", - "[n_value]\n\t[Eiger]Temperature of the left front end board fpga. " - "Cannot call this while blocking acquire is going on."); + "[n_value]\n\t[Eiger]Temperature of the left front end board fpga."); GET_IND_COMMAND(temp_slowadc, getTemperature, slsDetectorDefs::SLOW_ADC_TEMP, " °C", diff --git a/slsDetectorSoftware/src/Module.cpp b/slsDetectorSoftware/src/Module.cpp index c383a61a2..e24d39e53 100644 --- a/slsDetectorSoftware/src/Module.cpp +++ b/slsDetectorSoftware/src/Module.cpp @@ -357,10 +357,6 @@ void Module::setImageTestMode(const int value) { } int Module::getADC(dacIndex index) const { - // cannot access fpga links simultaneously (eiger) temp fix - if (index == TEMPERATURE_FPGA2 || index == TEMPERATURE_FPGA3) { - return sendToDetector(F_GET_ADC, index); - } return sendToDetectorStop(F_GET_ADC, index); }