From cefddff848338c7dd7b0c39462256bb020b42bbf Mon Sep 17 00:00:00 2001
From: Dhanya Thattil <dhanya.thattil@psi.ch>
Date: Tue, 20 Oct 2020 12:31:08 +0200
Subject: [PATCH] scan trimbits_scan changed to trimbits

---
 slsDetectorSoftware/src/CmdProxy.cpp        | 4 ++--
 slsDetectorSoftware/tests/test-CmdProxy.cpp | 6 +++---
 slsSupportLib/src/ToString.cpp              | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/slsDetectorSoftware/src/CmdProxy.cpp b/slsDetectorSoftware/src/CmdProxy.cpp
index e2d62a033..9da9abb9e 100644
--- a/slsDetectorSoftware/src/CmdProxy.cpp
+++ b/slsDetectorSoftware/src/CmdProxy.cpp
@@ -1027,12 +1027,12 @@ std::string CmdProxy::Scan(int action) {
     std::ostringstream os;
     os << cmd << ' ';
     if (action == defs::HELP_ACTION) {
-        os << "[dac_name|0|trimbit_scan] [start_val] [stop_val] "
+        os << "[dac_name|0|trimbits] [start_val] [stop_val] "
               "[step_size] [dac settling time ns|us|ms|s]\n\tEnables/ disables "
               "scans for dac and trimbits \n\tEnabling scan sets number of "
               "frames to number of steps in receiver. \n\tTo cancel scan "
               "configuration, set dac to '0', which also sets number of frames "
-              "to 1. \n\t[Eiger][Mythen3] Use trimbit_scan as dac name for a "
+              "to 1. \n\t[Eiger][Mythen3] Use trimbits as dac name for a "
               "trimbit scan."
            << '\n';
     } else if (action == defs::GET_ACTION) {
diff --git a/slsDetectorSoftware/tests/test-CmdProxy.cpp b/slsDetectorSoftware/tests/test-CmdProxy.cpp
index ca79c8308..5538fff9f 100644
--- a/slsDetectorSoftware/tests/test-CmdProxy.cpp
+++ b/slsDetectorSoftware/tests/test-CmdProxy.cpp
@@ -1423,15 +1423,15 @@ TEST_CASE("scan", "[.cmd][.new]") {
     if (det_type == defs::MYTHEN3 || defs::EIGER) {
         {
             std::ostringstream oss;
-            proxy.Call("scan", {"trimbit_scan", "0", "63", "16", "2s"}, -1, PUT,
+            proxy.Call("scan", {"trimbits", "0", "63", "16", "2s"}, -1, PUT,
                        oss);
-            CHECK(oss.str() == "scan [trimbit_scan, 0, 63, 16, 2s]\n");
+            CHECK(oss.str() == "scan [trimbits, 0, 63, 16, 2s]\n");
         }
         {
             std::ostringstream oss;
             proxy.Call("scan", {}, -1, GET, oss);
             CHECK(oss.str() ==
-                  "scan [enabled\ndac trimbit_scan\nstart 0\nstop 48\nstep "
+                  "scan [enabled\ndac trimbits\nstart 0\nstop 48\nstep "
                   "16\nsettleTime 2s\n]\n");
         }
     }
diff --git a/slsSupportLib/src/ToString.cpp b/slsSupportLib/src/ToString.cpp
index 975eb3668..4938e2852 100644
--- a/slsSupportLib/src/ToString.cpp
+++ b/slsSupportLib/src/ToString.cpp
@@ -488,7 +488,7 @@ std::string ToString(const defs::dacIndex s) {
     case defs::ADC_VPP:
         return std::string("adcvpp");
     case defs::TRIMBIT_SCAN:
-        return std::string("trimbit_scan");
+        return std::string("trimbits");
     case defs::HIGH_VOLTAGE:
         return std::string("highvoltage");
     case defs::IO_DELAY:
@@ -848,7 +848,7 @@ template <> defs::dacIndex StringTo(const std::string &s) {
         return defs::IBIAS_SFP;
     if (s == "adcvpp")
         return defs::ADC_VPP;
-    if (s == "trimbit_scan")
+    if (s == "trimbits")
         return defs::TRIMBIT_SCAN;
     if (s == "highvoltage")
         return defs::HIGH_VOLTAGE;