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

WIP doc

Browse Source
This commit is contained in:
maliakal_d
2020-08-19 17:13:39 +02:00
parent 9bae97ec4c
commit a287ce46b1
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/slsdet/detector.py
View File

@ -992,6 +992,8 @@ class Detector(CppDetectorApi):
| [Jungfrau] Absolute phase shift. Changing Speed also resets adcphase to recommended defaults. | [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. | [Ctb][Moench] Absolute phase shift. Changing adcclk also resets adcphase and sets it to previous values.
| [Gotthard] Relative phase shift. | [Gotthard] Relative phase shift.
:getter: Not implemented for Gotthard
""" """
return element_if_equal(self.getADCPhase()) return element_if_equal(self.getADCPhase())
@ -1001,6 +1003,8 @@ class Detector(CppDetectorApi):
@property @property
def adcpipeline(self): def adcpipeline(self):
"""[Ctb][Moench] Sets pipeline for ADC clock.
"""
return element_if_equal(self.getADCPipeline()) return element_if_equal(self.getADCPipeline())
@adcpipeline.setter @adcpipeline.setter

2
slsDetectorSoftware/include/Detector.h
View File

@ -238,7 +238,7 @@ class Detector {
* Options: FULL_SPEED, HALF_SPEED, QUARTER_SPEED */ * Options: FULL_SPEED, HALF_SPEED, QUARTER_SPEED */
void setSpeed(defs::speedLevel value, Positions pos = {}); void setSpeed(defs::speedLevel value, Positions pos = {});
/** [Gotthard][Jungfrau][CTB][Moench] */ /** [Jungfrau][CTB][Moench] */
Result<int> getADCPhase(Positions pos = {}) const; Result<int> getADCPhase(Positions pos = {}) const;
/** [Gotthard][Jungfrau][CTB][Moench] /** [Gotthard][Jungfrau][CTB][Moench]

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -563,7 +563,7 @@ std::string CmdProxy::Adcphase(int action) {
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[n_value] " os << "[n_value] "
"[(optional)deg]\n\t[Jungfrau][Ctb][Moench][Moench][Gotthard] " "[(optional)deg]\n\t[Jungfrau][Ctb][Moench][Gotthard] "
"Phase " "Phase "
"shift of ADC clock. \n\t[Jungfrau] Absolute phase shift. If deg " "shift of ADC clock. \n\t[Jungfrau] Absolute phase shift. If deg "
"used, then shift in degrees. Changing Speed also resets " "used, then shift in degrees. Changing Speed also resets "
@ -571,7 +571,7 @@ std::string CmdProxy::Adcphase(int action) {
"phase " "phase "
"shift. If deg used, then shift in degrees. Changing adcclk also " "shift. If deg used, then shift in degrees. Changing adcclk also "
"resets adcphase and sets it to previous values.\n\t[Gotthard] " "resets adcphase and sets it to previous values.\n\t[Gotthard] "
"Relative phase shift" "Relative phase shift. Cannot get"
<< '\n'; << '\n';
} else { } else {
auto det_type = det->getDetectorType().squash(defs::GENERIC); auto det_type = det->getDetectorType().squash(defs::GENERIC);