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

from timetest merge

Browse Source
This commit is contained in:
maliakal_d 2020-05-20 10:18:51 +02:00
parent 5690914048
commit 8973ef1aaa
3 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
slsDetectorSoftware/src/Detector.cpp
View File

@ -1288,14 +1288,7 @@ void Detector::setGateDelay(int gateIndex, ns t, Positions pos) {
Result<std::array<ns, 3>>
Detector::getGateDelayForAllGates(Positions pos) const {
auto t = pimpl->Parallel(&Module::getGateDelayForAllGates, pos);
Result<std::array<ns, 3>> res(t.size());
for (unsigned int i = 0; i < t.size(); ++i) {
for (unsigned int j = 0; j != 3; ++j) {
res[i][j] = static_cast<ns>(t[i][j]);
}
}
return res;
return pimpl->Parallel(&Module::getGateDelayForAllGates, pos);
}
// CTB/ Moench Specific

8
slsDetectorSoftware/src/Module.cpp
View File

@ -1063,7 +1063,6 @@ void Module::setExptime(int gateIndex, int64_t value) {
std::array<time::ns, 3> Module::getExptimeForAllGates() {
static_assert(sizeof(time::ns) == 8, "ns needs to be 64bit");
return sendToDetector<std::array<time::ns, 3>>(F_GET_EXPTIME_ALL_GATES);
}
int64_t Module::getGateDelay(int gateIndex) {
@ -1081,10 +1080,9 @@ void Module::setGateDelay(int gateIndex, int64_t value) {
}
}
std::array<int64_t, 3> Module::getGateDelayForAllGates() {
std::array<int64_t, 3> retval;
sendToDetector(F_GET_GATE_DELAY_ALL_GATES, nullptr, retval);
return retval;
std::array<time::ns, 3> Module::getGateDelayForAllGates() {
static_assert(sizeof(time::ns) == 8, "ns needs to be 64bit");
return sendToDetector<std::array<time::ns, 3>>(F_GET_GATE_DELAY_ALL_GATES);
}
int64_t Module::getPeriod() { return sendToDetector<int64_t>(F_GET_PERIOD); }

2
slsDetectorSoftware/src/Module.h
View File

@ -441,7 +441,7 @@ class Module : public virtual slsDetectorDefs {
void setGateDelay(int gateIndex, int64_t value);
/** [Mythen3] for all gates */
std::array<int64_t, 3> getGateDelayForAllGates();
std::array<time::ns, 3> getGateDelayForAllGates();
int64_t getPeriod();