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

changed gain mode. dynamic_gain_mode to dynamic only. binaries in

Browse Source
This commit is contained in:
maliakal_d
2021-08-06 16:38:05 +02:00
parent 67916cc188
commit e92270565b
20 changed files with 21 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/scripts/test_virtual.py
View File

@ -161,7 +161,7 @@ def test_gainmode(virtual_jf_detectors):
assert d.gainMode == gainMode.NORMAL_GAIN_MODE
gain_list = [
gainMode.DYNAMIC_GAIN_MODE,
gainMode.DYNAMIC,
gainMode.FORCE_SWITCH_G1,
gainMode.FORCE_SWITCH_G2,
gainMode.FIX_G1,
@ -176,7 +176,7 @@ def test_gainmode(virtual_jf_detectors):
d.setGainMode(gainMode.FORCE_SWITCH_G1, [1])
assert d.gainMode == [
gainMode.DYNAMIC_GAIN_MODE,
gainMode.DYNAMIC,
gainMode.FORCE_SWITCH_G1,
gainMode.FORCE_SWITCH_G2,
gainMode.FIX_G1,

2
python/slsdet/detector.py
View File

@ -2201,7 +2201,7 @@ class Detector(CppDetectorApi):
[Jungfrau] Detector gain mode. Enum: gainMode
Note
-----
[Jungfrau] DYNAMIC_GAIN_MODE, FORCE_SWITCH_G1, FORCE_SWITCH_G2, FIX_G1, FIX_G2, FIX_G0 \n
[Jungfrau] DYNAMIC, FORCE_SWITCH_G1, FORCE_SWITCH_G2, FIX_G1, FIX_G2, FIX_G0 \n
CAUTION: Do not use FIX_G0 without caution, you can damage the detector!!!
"""
return element_if_equal(self.getGainMode())

2
python/src/enums.cpp
View File

@ -308,7 +308,7 @@ void init_enums(py::module &m) {
.export_values();
py::enum_<slsDetectorDefs::gainMode>(Defs, "gainMode")
.value("DYNAMIC_GAIN_MODE", slsDetectorDefs::gainMode::DYNAMIC_GAIN_MODE)
.value("DYNAMIC", slsDetectorDefs::gainMode::DYNAMIC)
.value("FORCE_SWITCH_G1", slsDetectorDefs::gainMode::FORCE_SWITCH_G1)
.value("FORCE_SWITCH_G2", slsDetectorDefs::gainMode::FORCE_SWITCH_G2)
.value("FIX_G1", slsDetectorDefs::gainMode::FIX_G1)