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

WIP doc

Browse Source
This commit is contained in:
maliakal_d
2020-08-21 13:20:32 +02:00
parent 4f45110cda
commit cf6a48d7a9
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
python/slsdet/detector.py
View File

@ -197,6 +197,14 @@ class Detector(CppDetectorApi):
@property
def frames(self):
"""Number of frames per acquisition. In trigger mode, number of frames per trigger.
Notes
-----
Cannot be set in modular level. ????
In scan mode, number of frames is set to number of steps.
[Gotthard2] Burst mode has a maximum of 2720 frames.
"""
return element_if_equal(self.getNumberOfFrames())
@frames.setter
@ -472,6 +480,7 @@ class Detector(CppDetectorApi):
@property
def fwrite(self):
"""Enable or disable receiver file write. Default is enabled. """
return element_if_equal(self.getFileWrite())
@fwrite.setter

2
slsDetectorSoftware/include/Detector.h
View File

@ -170,6 +170,8 @@ class Detector {
Result<int64_t> getNumberOfFrames(Positions pos = {}) const;
/** In trigger mode, number of frames per trigger. In scan mode, number of
* frames is set to number of steps */
void setNumberOfFrames(int64_t value);
Result<int64_t> getNumberOfTriggers(Positions pos = {}) const;

2
slsDetectorSoftware/src/CmdProxy.cpp
View File

@ -203,7 +203,7 @@ std::string CmdProxy::Acquire(int action) {
return os.str();
}
std::string CmdProxy::free(int action) {
std::string CmdProxy::Free(int action) {
// This function is purely for help, actual functionality is in the caller
return "free\n\tFree detector shared memory\n";
}

11
slsDetectorSoftware/src/CmdProxy.h
View File

@ -635,7 +635,7 @@ class CmdProxy {
/* configuration */
{"config", &CmdProxy::config},
{"free", &CmdProxy::free},
{"free", &CmdProxy::Free},
{"parameters", &CmdProxy::parameters},
{"hostname", &CmdProxy::Hostname},
{"virtual", &CmdProxy::VirtualServer},
@ -1011,7 +1011,7 @@ class CmdProxy {
/* Commands */
std::string ListCommands(int action);
/* configuration */
std::string free(int action);
std::string Free(int action);
// std::string config2(int action);
std::string Hostname(int action);
std::string VirtualServer(int action);
@ -1161,9 +1161,10 @@ class CmdProxy {
INTEGER_COMMAND_NOID(
frames, getNumberOfFrames, setNumberOfFrames, StringTo<int64_t>,
"[n_frames]\n\tNumber of frames per aquire. In trigger mode, number of "
"frames per trigger."
"\n\t[Gotthard2] Burst mode has a maximum of 2720 frames.");
"[n_frames]\n\tNumber of frames per acquisition. In "
"trigger mode, number of frames per trigger. Cannot be set in modular "
"level. In scan mode, number of frames is set to number of "
"steps.\n\t[Gotthard2] Burst mode has a maximum of 2720 frames.");
INTEGER_COMMAND_NOID(triggers, getNumberOfTriggers, setNumberOfTriggers,
StringTo<int64_t>,