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

Merge branch 'jungfrau1.1' into j11udpate

Browse Source
This commit is contained in:
maliakal_d
2021-08-03 20:31:43 +02:00
parent 5ba41894ef c7326504eb
commit 6dfcd9607f
7 changed files with 17 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
slsDetectorSoftware/include/sls/Detector.h
View File

@ -1127,7 +1127,7 @@ class Detector {
void resetTemperatureEvent(Positions pos = {});
/** [Jungfrau] */
Result<bool> getAutoCompDisable(Positions pos = {}) const;
Result<bool> getAutoComparatorDisable(Positions pos = {}) const;
/** [Jungfrau] Advanced
* //TODO naming
@ -1139,7 +1139,7 @@ class Detector {
* disabled(comparator enabled throughout). true enables mode. 0 disables
* mode.
*/
void setAutoCompDisable(bool value, Positions pos = {});
void setAutoComparatorDisable(bool value, Positions pos = {});
/** [Jungfrau] */
Result<ns> getComparatorDisableTime(Positions pos = {}) const;

2
slsDetectorSoftware/src/CmdProxy.h
View File

@ -1838,7 +1838,7 @@ class CmdProxy {
"cleared.");
INTEGER_COMMAND_VEC_ID(
auto_comp_disable, getAutoCompDisable, setAutoCompDisable,
auto_comp_disable, getAutoComparatorDisable, setAutoComparatorDisable,
StringTo<int>,
"[0, 1]\n\t[Jungfrau] Auto comparator disable mode. By default, the "
"on-chip gain switching is active during the entire exposure.This mode "

4
slsDetectorSoftware/src/Detector.cpp
View File

@ -1451,11 +1451,11 @@ void Detector::resetTemperatureEvent(Positions pos) {
pimpl->Parallel(&Module::resetTemperatureEvent, pos);
}
Result<bool> Detector::getAutoCompDisable(Positions pos) const {
Result<bool> Detector::getAutoComparatorDisable(Positions pos) const {
return pimpl->Parallel(&Module::getAutoComparatorDisableMode, pos);
}
void Detector::setAutoCompDisable(bool value, Positions pos) {
void Detector::setAutoComparatorDisable(bool value, Positions pos) {
pimpl->Parallel(&Module::setAutoComparatorDisableMode, pos, value);
}

4
slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
View File

@ -258,7 +258,7 @@ TEST_CASE("auto_comp_disable", "[.cmd]") {
CmdProxy proxy(&det);
auto det_type = det.getDetectorType().squash();
if (det_type == defs::JUNGFRAU) {
auto prev_val = det.getAutoCompDisable();
auto prev_val = det.getAutoComparatorDisable();
{
std::ostringstream oss;
proxy.Call("auto_comp_disable", {"0"}, -1, PUT, oss);
@ -275,7 +275,7 @@ TEST_CASE("auto_comp_disable", "[.cmd]") {
REQUIRE(oss.str() == "auto_comp_disable 1\n");
}
for (int i = 0; i != det.size(); ++i) {
det.setAutoCompDisable(prev_val[i], {i});
det.setAutoComparatorDisable(prev_val[i], {i});
}
} else {
REQUIRE_THROWS(proxy.Call("auto_comp_disable", {}, -1, GET));