wip

RELEASE.txt

@@ -64,6 +64,7 @@ This document describes the differences between 5.2.0 and 5.1.0 releases.
 
 getAutoCompDisable->getAutoComparatorDisable
 setBottom->setFlippedDataAcrossXAxis
+filter->filterResistor
 
 3. Firmware Requirements
 ========================

slsDetectorSoftware/include/sls/Detector.h

@@ -477,6 +477,14 @@ class Detector {
      * [Mythen3] If exposure time is too short, acquisition will return with an
      * ERROR and take fewer frames than expected */
     void setParallelMode(bool value, Positions pos = {});
+
+    /** [Gotthard2][Jungfrau] */
+    Result<int> getFilterResistor(Positions pos = {}) const;
+
+    /** [Gotthard2] Options: 0-3. Default: 0
+     * [Jungfrau] 0-1. Default: 1 */
+    void setFilterResistor(int value, Positions pos = {});
+
     ///@{
 
     /** @name Acquisition */
@@ -1282,12 +1290,6 @@ class Detector {
     /** default disabled */
     void setCDSGain(bool value, Positions pos = {});
 
-    /** [Gotthard2] */
-    Result<int> getFilter(Positions pos = {}) const;
-
-    /** [Gotthard2] Set filter resister. Options: 0-3. Default: 0 */
-    void setFilter(int value, Positions pos = {});
-
     /** [Gotthard2] */
     Result<bool> getCurrentSource(Positions pos = {}) const;
 

slsDetectorSoftware/src/CmdProxy.h

@@ -591,6 +591,7 @@ class CmdProxy {
         {"clkdivider", "speed"},
         {"vhighvoltage", "highvoltage"},
         {"digitest", "imagetest"},
+        {"filter", "filterresistor"},
 
         /** temperature */
 
@@ -800,6 +801,7 @@ class CmdProxy {
         {"imagetest", &CmdProxy::imagetest},
         {"extsig", &CmdProxy::ExternalSignal},
         {"parallel", &CmdProxy::parallel},
+        {"filterresistor", &CmdProxy::filterresistor},
 
         /** temperature */
         {"templist", &CmdProxy::templist},
@@ -947,7 +949,6 @@ class CmdProxy {
         {"vetofile", &CmdProxy::VetoFile},
         {"burstmode", &CmdProxy::BurstMode},
         {"cdsgain", &CmdProxy::cdsgain},
-        {"filter", &CmdProxy::filter},
         {"currentsource", &CmdProxy::currentsource},
         {"timingsource", &CmdProxy::timingsource},
         {"veto", &CmdProxy::veto},
@@ -1348,6 +1349,11 @@ class CmdProxy {
         "acquisition will return ERROR status and take fewer "
         "frames than expected.");
 
+    INTEGER_COMMAND_VEC_ID(
+        filterresistor, getFilterResistor, setFilterResistor, StringTo<int>,
+        "[0|1|2|3] [Gotthard2] Set filter resistor. Default is 0.\n[0|1] "
+        "[Jungfrau] Set filter resistor. Default is 1.");
+
     /** temperature */
     GET_COMMAND_NOID(
         templist, getTemperatureList,
@@ -1911,10 +1917,6 @@ class CmdProxy {
         "[0, 1]\n\t[Gotthard2] Enable or disable CDS gain. Default "
         "is disabled.");
 
-    INTEGER_COMMAND_VEC_ID(
-        filter, getFilter, setFilter, StringTo<int>,
-        "[0|1|2|3]\n\t[Gotthard2] Set filter resistor. Default is 0.");
-
     INTEGER_COMMAND_VEC_ID(
         currentsource, getCurrentSource, setCurrentSource, StringTo<int>,
         "[0, 1]\n\t[Gotthard2] Enable or disable current source. "