From a287ce46b1ca5504148cc31b32bfa336b2ce05ab Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Wed, 19 Aug 2020 17:13:39 +0200 Subject: [PATCH] WIP doc --- python/slsdet/detector.py | 4 ++++ slsDetectorSoftware/include/Detector.h | 2 +- slsDetectorSoftware/src/CmdProxy.cpp | 4 ++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index 3fa91f927..1a4bc5d03 100755 --- a/python/slsdet/detector.py +++ b/python/slsdet/detector.py @@ -992,6 +992,8 @@ class Detector(CppDetectorApi): | [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to recommended defaults. | [Ctb][Moench] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values. | [Gotthard] Relative phase shift. + + :getter: Not implemented for Gotthard """ return element_if_equal(self.getADCPhase()) @@ -1001,6 +1003,8 @@ class Detector(CppDetectorApi): @property def adcpipeline(self): + """[Ctb][Moench] Sets pipeline for ADC clock. + """ return element_if_equal(self.getADCPipeline()) @adcpipeline.setter diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index b27467311..ab7598910 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -238,7 +238,7 @@ class Detector { * Options: FULL_SPEED, HALF_SPEED, QUARTER_SPEED */ void setSpeed(defs::speedLevel value, Positions pos = {}); - /** [Gotthard][Jungfrau][CTB][Moench] */ + /** [Jungfrau][CTB][Moench] */ Result getADCPhase(Positions pos = {}) const; /** [Gotthard][Jungfrau][CTB][Moench] diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index ccbeb4dfb..ca6251625 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -563,7 +563,7 @@ std::string CmdProxy::Adcphase(int action) { os << cmd << ' '; if (action == defs::HELP_ACTION) { os << "[n_value] " - "[(optional)deg]\n\t[Jungfrau][Ctb][Moench][Moench][Gotthard] " + "[(optional)deg]\n\t[Jungfrau][Ctb][Moench][Gotthard] " "Phase " "shift of ADC clock. \n\t[Jungfrau] Absolute phase shift. If deg " "used, then shift in degrees. Changing Speed also resets " @@ -571,7 +571,7 @@ std::string CmdProxy::Adcphase(int action) { "phase " "shift. If deg used, then shift in degrees. Changing adcclk also " "resets adcphase and sets it to previous values.\n\t[Gotthard] " - "Relative phase shift" + "Relative phase shift. Cannot get" << '\n'; } else { auto det_type = det->getDetectorType().squash(defs::GENERIC);