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

merge fix

Browse Source
This commit is contained in:
maliakal_d
2022-03-28 09:11:32 +02:00
parent e479b7d4be fa694dbc4c
commit 2453390cc3
27 changed files with 349 additions and 343 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
python/slsdet/detector.py
View File

@ -599,7 +599,7 @@ class Detector(CppDetectorApi):
@property
@element
def rx_framescaught(self):
"""Number of frames caught by receiver."""
"""Number of frames caught by each port in receiver."""
return self.getFramesCaught()
@property
@ -1918,7 +1918,7 @@ class Detector(CppDetectorApi):
@property
@element
def rx_frameindex(self):
"""Current frame index received in receiver during acquisition."""
"""Current frame index received for each port in receiver during acquisition."""
return self.getRxCurrentFrameIndex()
@property

12
python/src/detector.cpp
View File

@ -493,13 +493,17 @@ void init_det(py::module &m) {
Detector::getReceiverStatus,
py::arg() = Positions{})
.def("getFramesCaught",
(Result<int64_t>(Detector::*)(sls::Positions) const) &
(Result<std::vector<int64_t>>(Detector::*)(sls::Positions) const) &
Detector::getFramesCaught,
py::arg() = Positions{})
.def("getNumMissingPackets",
(Result<std::vector<int64_t>>(Detector::*)(sls::Positions) const) &
Detector::getNumMissingPackets,
py::arg() = Positions{})
.def("getRxCurrentFrameIndex",
(Result<std::vector<int64_t>>(Detector::*)(sls::Positions) const) &
Detector::getRxCurrentFrameIndex,
py::arg() = Positions{})
.def("getNextFrameNumber",
(Result<uint64_t>(Detector::*)(sls::Positions) const) &
Detector::getNextFrameNumber,
@ -1657,9 +1661,5 @@ void init_det(py::module &m) {
Detector::getMeasurementTime,
py::arg() = Positions{})
.def("getUserDetails",
(std::string(Detector::*)() const) & Detector::getUserDetails)
.def("getRxCurrentFrameIndex",
(Result<uint64_t>(Detector::*)(sls::Positions) const) &
Detector::getRxCurrentFrameIndex,
py::arg() = Positions{});
(std::string(Detector::*)() const) & Detector::getUserDetails);
}