detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-20 02:40:03 +02:00
Code Issues Actions Packages Releases Activity

wip, doc

Browse Source
This commit is contained in:
maliakal_d 2020-09-21 18:30:33 +02:00
parent 804ad0997c
commit 65da9e701b
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/slsdet/detector.py
View File

@ -2361,7 +2361,9 @@ class Detector(CppDetectorApi):
@property @property
def pattern(self): def pattern(self):
"""[Mythen3][Moench][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line). """[Mythen3][Moench][Ctb] Loads ASCII pattern file directly to server (instead of executing line by line).
Note
----
:getter: Not Implemented
Example Example
--------- ---------
>>> d.pattern = '/tmp/pat.txt' >>> d.pattern = '/tmp/pat.txt'

11
slsDetectorSoftware/include/Detector.h
View File

@ -1394,7 +1394,8 @@ class Detector {
* * * *
* ************************************************/ * ************************************************/
/** [CTB][Moench][Mythen3] */ /** [CTB][Moench][Mythen3] Loads ASCII pattern file directly to server
* (instead of executing line by line)*/
void setPattern(const std::string &fname, Positions pos = {}); void setPattern(const std::string &fname, Positions pos = {});
/** [CTB][Moench][Mythen3] */ /** [CTB][Moench][Mythen3] */
@ -1409,9 +1410,9 @@ class Detector {
/** [CTB][Moench][Mythen3] same as executing for ctb and moench */ /** [CTB][Moench][Mythen3] same as executing for ctb and moench */
Result<uint64_t> getPatternWord(int addr, Positions pos = {}); Result<uint64_t> getPatternWord(int addr, Positions pos = {});
/** [CTB] Caution: If word is -1 reads the addr (same as /** [CTB][Moench] Caution: If word is -1 reads the addr (same as
* executing the pattern) * executing the pattern)
* [Mythen3][Moench] */ * [Mythen3] */
void setPatternWord(int addr, uint64_t word, Positions pos = {}); void setPatternWord(int addr, uint64_t word, Positions pos = {});
/**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2 /**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
@ -1427,9 +1428,7 @@ class Detector {
Positions pos = {}); Positions pos = {});
/**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2 /**[CTB][Moench][Mythen3] Options: level: -1 (complete pattern) and 0-2
* levels * levels */
* @returns number of loops
*/
Result<int> getPatternLoopCycles(int level, Positions pos = {}) const; Result<int> getPatternLoopCycles(int level, Positions pos = {}) const;
/** [CTB][Moench][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2 /** [CTB][Moench][Mythen3] n: 0-2, level: -1 (complete pattern) and 0-2

4
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -2108,8 +2108,8 @@ std::string CmdProxy::PatternWord(int action) {
os << cmd << ' '; os << cmd << ' ';
if (action == defs::HELP_ACTION) { if (action == defs::HELP_ACTION) {
os << "[step or address] [64 bit mask]\n\t[Ctb][Moench][Mythen3] 64 " os << "[step or address] [64 bit mask]\n\t[Ctb][Moench][Mythen3] 64 "
"bit pattern at " "bit pattern at address of pattern memory.\n\t[Ctb][Moench] read "
"address of pattern memory." "is same as executing pattern"
<< '\n'; << '\n';
} else if (action == defs::GET_ACTION) { } else if (action == defs::GET_ACTION) {
if (args.size() != 1) { if (args.size() != 1) {