merge resolved

slsDetectorSoftware/src/Detector.cpp

@@ -203,6 +203,110 @@ void Detector::setMaxNumberOfChannels(const defs::coordinates value) {
     pimpl->setMaxNumberOfChannels(value);
 }
 // Erik
+Result<int> Detector::getFramesCaughtByReceiver(Positions pos) const{
+    return pimpl->Parallel(&slsDetector::getFramesCaughtByReceiver, pos);
+}
+
+Result<uint64_t> Detector::getReceiverCurrentFrameIndex(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::getReceiverCurrentFrameIndex, pos);
+}
+
+void Detector::resetFramesCaught(Positions pos) {
+    pimpl->Parallel(&slsDetector::resetFramesCaught, pos);
+}
+
+void Detector::setMasterFileWrite(bool value, Positions pos) {
+    pimpl->Parallel(&slsDetector::setMasterFileWrite, pos, value);
+}
+
+Result<bool> Detector::getMasterFileWrite(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::getMasterFileWrite, pos);
+}
+
+void Detector::setReceiverStreamingTimer(int time_in_ms, Positions pos) {
+    pimpl->Parallel(&slsDetector::setReceiverStreamingTimer, pos, time_in_ms);
+}
+
+Result<int> Detector::getReceiverStreamingTimer(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setReceiverStreamingTimer, pos, -1);
+}
+
+void Detector::setTenGigaEnabled(bool value, Positions pos) {
+    pimpl->Parallel(&slsDetector::enableTenGigabitEthernet, pos,
+                    static_cast<int>(value));
+}
+
+Result<bool> Detector::getTenGigaEnabled(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::enableTenGigabitEthernet, pos, -1);
+}
+
+Result<int> Detector::getReceiverFifoDepth(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setReceiverFifoDepth, pos, -1);
+}
+
+void Detector::setReceiverFifoDepth(int nframes, Positions pos) {
+    pimpl->Parallel(&slsDetector::setReceiverFifoDepth, pos, nframes);
+}
+
+Result<bool> Detector::getReceiverSilentMode(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setReceiverSilentMode, pos, -1);
+}
+
+void Detector::setReceiverSilentMode(bool value, Positions pos) {
+    pimpl->Parallel(&slsDetector::setReceiverSilentMode, pos,
+                    static_cast<int>(value));
+}
+
+void Detector::setPattern(const std::string &fname, Positions pos) {
+    pimpl->Parallel(&slsDetector::setPattern, pos, fname);
+}
+
+void Detector::setPatternIOControl(uint64_t word, Positions pos) {
+    pimpl->Parallel(&slsDetector::setPatternIOControl, pos, word);
+}
+
+Result<uint64_t> Detector::getPatternIOControl(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setPatternIOControl, pos, -1);
+}
+
+void Detector::setPatternClockControl(uint64_t word, Positions pos) {
+    pimpl->Parallel(&slsDetector::setPatternClockControl, pos, word);
+}
+
+Result<uint64_t> Detector::getPatternClockControl(Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setPatternClockControl, pos, -1);
+}
+
+void Detector::setPatternWord(int addr, uint64_t word, Positions pos) {
+    pimpl->Parallel(&slsDetector::setPatternWord, pos, addr, word);
+}
+
+void Detector::setPatternLoops(int level, int start, int stop, int n,
+                               Positions pos) {
+    pimpl->Parallel(&slsDetector::setPatternLoops, pos, level, start, stop, n);
+}
+
+Result<std::array<int, 3>> Detector::getPatternLoops(int level,
+                                                     Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setPatternLoops, pos, level, -1, -1,
+                           -1);
+}
+
+void Detector::setPatternWaitAddr(int level, int addr, Positions pos) {
+    pimpl->Parallel(&slsDetector::setPatternWaitAddr, pos, level, addr);
+}
+
+Result<int> Detector::getPatternWaitAddr(int level, Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setPatternWaitAddr, pos, level, -1);
+}
+
+void Detector::setPatternWaitTime(int level, uint64_t t, Positions pos) {
+    pimpl->Parallel(&slsDetector::setPatternWaitTime, pos, level, t);
+}
+
+Result<uint64_t> Detector::getPatternWaitTime(int level, Positions pos) const {
+    return pimpl->Parallel(&slsDetector::setPatternWaitTime, pos, level, -1);
+}
 
 Result<uint64_t> Detector::getPatternMask(Positions pos) {
     return pimpl->Parallel(&slsDetector::getPatternMask, pos);