From b9016fad1224fa2a16b2db15110d91a5423b9a07 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Thu, 24 Feb 2022 11:26:17 +0100 Subject: [PATCH] reverting to normal command parsing for missing packets --- slsDetectorSoftware/src/CmdProxy.cpp | 21 --------------------- slsDetectorSoftware/src/CmdProxy.h | 6 +++++- 2 files changed, 5 insertions(+), 22 deletions(-) diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index c2bdba22b..0e8a1a3db 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -1274,27 +1274,6 @@ std::string CmdProxy::DetectorStatus(int action) { return os.str(); } -std::string CmdProxy::RxMissingPackets(int action) { - std::ostringstream os; - os << cmd << ' '; - if (action == defs::HELP_ACTION) { - os << "Number of missing packets for each port in receiver. If " - "negative, they are packets in excess. " - << '\n'; - } else if (action == defs::GET_ACTION) { - if (!args.empty()) { - WrongNumberOfParameters(0); - } - auto mp = det->getNumMissingPackets(std::vector{det_id}); - os << OutString(mp) << '\n'; - } else if (action == defs::PUT_ACTION) { - throw sls::RuntimeError("Cannot put"); - } else { - throw sls::RuntimeError("Unknown action"); - } - return os.str(); -} - std::string CmdProxy::Scan(int action) { std::ostringstream os; os << cmd << ' '; diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index d6bca310c..4efcfe4ed 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -859,7 +859,7 @@ class CmdProxy { {"rx_status", &CmdProxy::ReceiverStatus}, {"status", &CmdProxy::DetectorStatus}, {"rx_framescaught", &CmdProxy::rx_framescaught}, - {"rx_missingpackets", &CmdProxy::RxMissingPackets}, + {"rx_missingpackets", &CmdProxy::rx_missingpackets}, {"rx_frameindex", &CmdProxy::rx_frameindex}, {"nextframenumber", &CmdProxy::nextframenumber}, {"trigger", &CmdProxy::Trigger}, @@ -1535,6 +1535,10 @@ class CmdProxy { GET_COMMAND(rx_framescaught, getFramesCaught, "\n\tNumber of frames caught by each port in receiver."); + GET_COMMAND(rx_missingpackets, getNumMissingPackets, + "\n\tNumber of missing packets for each port in receiver. If " + "negative, they are packets in excess. "); + GET_COMMAND( rx_frameindex, getRxCurrentFrameIndex, "\n\tCurrent frame index received in receiver during acquisition.");