jungfrau: api changed from set/getFilterCell to set/getNumberOfFilterCells, storagecells command line changed to extrastoragecells, fixed wrong numberof arguments parsing message

slsDetectorSoftware/src/CmdProxy.cpp

@@ -87,9 +87,9 @@ void CmdProxy::WrongNumberOfParameters(size_t expected) {
                            " expected no parameter/s but got " +
                            std::to_string(args.size()) + "\n");
     }
-    throw RuntimeError(
-        "Command " + cmd + " expected >=" + std::to_string(expected) +
-        " parameter/s but got " + std::to_string(args.size()) + "\n");
+    throw RuntimeError("Command " + cmd + " expected (or >=) " +
+                       std::to_string(expected) + " parameter/s but got " +
+                       std::to_string(args.size()) + "\n");
 }
 
 /************************************************

slsDetectorSoftware/src/CmdProxy.h

@@ -725,6 +725,8 @@ class CmdProxy {
         {"resmat", "partialreset"},
 
         /* Jungfrau Specific */
+        {"storagecells", "extrastoragecells"},
+
         /* Gotthard Specific */
         /* Gotthard2 Specific */
         /* Mythen3 Specific */
@@ -944,7 +946,7 @@ class CmdProxy {
         {"temp_event", &CmdProxy::TemperatureEvent},
         {"auto_comp_disable", &CmdProxy::auto_comp_disable},
         {"comp_disable_time", &CmdProxy::comp_disable_time},
-        {"storagecells", &CmdProxy::storagecells},
+        {"extrastoragecells", &CmdProxy::extrastoragecells},
         {"storagecell_start", &CmdProxy::storagecell_start},
         {"storagecell_delay", &CmdProxy::storagecell_delay},
         {"gainmode", &CmdProxy::gainmode},
@@ -1923,12 +1925,12 @@ class CmdProxy {
                  "only possible for chipv1.1.");
 
     INTEGER_COMMAND_SET_NOID_GET_ID(
-        storagecells, getNumberOfAdditionalStorageCells,
+        extrastoragecells, getNumberOfAdditionalStorageCells,
         setNumberOfAdditionalStorageCells, StringTo<int>,
         "[0-15]\n\t[Jungfrau] Only for chipv1.0. Number of additional storage "
         "cells. Default is "
         "0. For advanced users only. \n\tThe #images = #frames x #triggers x "
-        "(#storagecells + 1).");
+        "(#extrastoragecells + 1).");
 
     INTEGER_COMMAND_VEC_ID(
         storagecell_start, getStorageCellStart, setStorageCellStart,
@@ -1951,8 +1953,8 @@ class CmdProxy {
         "Jungfrau] Gain mode.\n\tCAUTION: Do not use fixg0 without caution, "
         "you can damage the detector!!!");
 
-    INTEGER_COMMAND_VEC_ID(filtercells, getFilterCell, setFilterCell,
-                           sls::StringTo<int>,
+    INTEGER_COMMAND_VEC_ID(filtercells, getNumberOfFilterCells,
+                           setNumberOfFilterCells, sls::StringTo<int>,
                            "[0-12]\n\t[Jungfrau] Set Filter Cell. Only for "
                            "chipv1.1. Advanced user Command");
 

slsDetectorSoftware/src/Detector.cpp

@@ -1562,12 +1562,12 @@ void Detector::setGainMode(const defs::gainMode mode, Positions pos) {
     pimpl->Parallel(&Module::setGainMode, pos, mode);
 }
 
-Result<int> Detector::getFilterCell(Positions pos) const {
-    return pimpl->Parallel(&Module::getFilterCell, pos);
+Result<int> Detector::getNumberOfFilterCells(Positions pos) const {
+    return pimpl->Parallel(&Module::getNumberOfFilterCells, pos);
 }
 
-void Detector::setFilterCell(int cell, Positions pos) {
-    pimpl->Parallel(&Module::setFilterCell, pos, cell);
+void Detector::setNumberOfFilterCells(int cell, Positions pos) {
+    pimpl->Parallel(&Module::setNumberOfFilterCells, pos, cell);
 }
 
 // Gotthard Specific

slsDetectorSoftware/src/Module.cpp

@@ -1692,12 +1692,12 @@ void Module::setGainMode(const slsDetectorDefs::gainMode mode) {
     sendToDetector(F_SET_GAIN_MODE, mode, nullptr);
 }
 
-int Module::getFilterCell() const {
-    return sendToDetector<int>(F_GET_FILTER_CELL);
+int Module::getNumberOfFilterCells() const {
+    return sendToDetector<int>(F_GET_NUM_FILTER_CELLS);
 }
 
-void Module::setFilterCell(int value) {
-    sendToDetector(F_SET_FILTER_CELL, value, nullptr);
+void Module::setNumberOfFilterCells(int value) {
+    sendToDetector(F_SET_NUM_FILTER_CELLS, value, nullptr);
 }
 
 // Gotthard Specific

slsDetectorSoftware/src/Module.h

@@ -387,8 +387,8 @@ class Module : public virtual slsDetectorDefs {
     void setStorageCellDelay(int64_t value);
     gainMode getGainMode() const;
     void setGainMode(const gainMode mode);
-    int getFilterCell() const;
-    void setFilterCell(int value);
+    int getNumberOfFilterCells() const;
+    void setNumberOfFilterCells(int value);
 
     /**************************************************
      *                                                *