diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 077004bdf..1675a5112 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -1209,6 +1209,12 @@ class Detector(CppDetectorApi): @property def threshold(self): + """[Eiger] Threshold in eV + Note + ---- + To change settings as well or set threshold without trimbits, use setThresholdEnergy. + :setter: It loads trim files from settingspath. + """ return element_if_equal(self.getThresholdEnergy()) @threshold.setter @@ -1217,6 +1223,15 @@ class Detector(CppDetectorApi): @property def timing(self): + """ + Set Timing Mode of detector. Enum: timingMode + Note + ----- + Default: AUTO_TIMING \n + [Jungfrau][Gotthard][Ctb][Moench][Gotthard2] AUTO_TIMING, TRIGGER_EXPOSURE \n + [Mythen3] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n + [Eiger] AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER + """ return element_if_equal(self.getTimingMode()) @timing.setter @@ -1355,6 +1370,7 @@ class Detector(CppDetectorApi): @property def tengiga(self): + """[Eiger][Ctb][Moench][Mythen3] 10GbE Enable.""" return element_if_equal(self.getTenGiga()) @tengiga.setter diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index ddea67c0d..dd04691c1 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -231,9 +231,9 @@ class Detector { Result getTimingMode(Positions pos = {}) const; /** - * [Gotthard][Jungfrau][CTB][Moench][Mythen3] Options: - * AUTO_TIMING, TRIGGER_EXPOSURE - * [Gotthard2] Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED + * [Gotthard][Jungfrau][Gotthard][CTB][Moench][Gotthard2] Options: + * AUTO_TIMING, TRIGGER_EXPOSURE \n + * [Mythen3] Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, TRIGGER_GATED \n * [Eiger] Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER */ void setTimingMode(defs::timingMode value, Positions pos = {}); @@ -367,9 +367,11 @@ class Detector { /** gets list of dac enums for this detector */ std::vector getDacList() const; - Result getDAC(defs::dacIndex index, bool mV = false, Positions pos = {}) const; + Result getDAC(defs::dacIndex index, bool mV = false, + Positions pos = {}) const; - void setDAC(defs::dacIndex index, int value, bool mV = false, Positions pos = {}); + void setDAC(defs::dacIndex index, int value, bool mV = false, + Positions pos = {}); /* [Gotthard2] */ Result getOnChipDAC(defs::dacIndex index, int chipIndex, @@ -851,7 +853,7 @@ class Detector { /** [Eiger] */ Result getThresholdEnergy(Positions pos = {}) const; - /** [Eiger] */ + /** [Eiger] It loads trim files from settingspath */ void setThresholdEnergy(int threshold_ev, defs::detectorSettings settings = defs::STANDARD, bool trimbits = true, Positions pos = {}); diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 3546a53d0..6a291e577 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -1222,7 +1222,8 @@ std::string CmdProxy::Threshold(int action) { if (action == defs::HELP_ACTION) { os << "[eV] [(optinal settings) standard, lowgain, veryhighgain, " "verylowgain]" - "\n\t[Eiger] Threshold in eV" + "\n\t[Eiger] Threshold in eV. It loads trim files from " + "settingspath." << '\n'; } else if (action == defs::GET_ACTION) { if (!args.empty()) { diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index 917b2fbbc..592c98ce5 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -1208,8 +1208,8 @@ class CmdProxy { INTEGER_COMMAND(timing, getTimingMode, setTimingMode, sls::StringTo, "[auto|trigger|gating|burst_trigger]\n\tTiming Mode of " - "detector.\n\t[Jungfrau][Gotthard][Mythen3][Ctb][Moench] " - "[auto|trigger]\n\t[Gotthard2] " + "detector.\n\t[Jungfrau][Gotthard][Ctb][Moench][Gotthard2] " + "[auto|trigger]\n\t[Mythen3] " "[auto|trigger|gating|trigger_gating]\n\t[Eiger] " "[auto|trigger|gating|burst_trigger]");