From f6911c423804bd6d290b96a7d61e3e2e38a6c9d2 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 23 Jun 2020 09:02:26 +0200 Subject: [PATCH] WIP --- slsDetectorSoftware/src/CmdProxy.cpp | 2 +- slsDetectorSoftware/src/CmdProxy.h | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp index 968c8098b..35ce144be 100644 --- a/slsDetectorSoftware/src/CmdProxy.cpp +++ b/slsDetectorSoftware/src/CmdProxy.cpp @@ -1970,7 +1970,7 @@ std::string CmdProxy::PatternWord(int action) { WrongNumberOfParameters(1); } auto t = det->getPatternWord(StringTo(args[0]), {det_id}); - os << OutStringHex(t, 16) << '\n'; + os << OutStringHex(t) << '\n'; } else if (action == defs::PUT_ACTION) { if (args.size() != 2) { WrongNumberOfParameters(2); diff --git a/slsDetectorSoftware/src/CmdProxy.h b/slsDetectorSoftware/src/CmdProxy.h index 28ec6208e..30024f198 100644 --- a/slsDetectorSoftware/src/CmdProxy.h +++ b/slsDetectorSoftware/src/CmdProxy.h @@ -433,13 +433,12 @@ class CmdProxy { return ToStringHex(value.front()); return ToStringHex(value); } - - template std::string OutStringHex(const V &value, int width) { - if (value.equal()) - return ToStringHex(value.front(), width); - return ToStringHex(value, width); - } - + /* + template std::string OutStringHex(const V &value, int + width) { if (value.equal()) return ToStringHex(value.front(), width); + return ToStringHex(value, width); + } + */ template std::string OutString(const V &value) { if (value.equal()) return ToString(value.front());