filter resistor in

python/slsdet/detector.py

@@ -2238,17 +2238,18 @@ class Detector(CppDetectorApi):
 
     @property
     @element
-    def filter(self):
+    def filterresistor(self):
-        """[Gotthard2] Set filter resistor. 
+        """[Gotthard2][Jungfrau] Set filter resistor. 
         Note
         ----
-        Default is 0. Options: 0-3.
+        [Gotthard2] Default is 0. Options: 0-3.
+        [Jungfrau] Default is 1. Options: 0-1.
         """
-        return self.getFilter()
+        return self.getFilterResistor()
 
     @filter.setter
     def filter(self, value):
-        ut.set_using_dict(self.setFilter, value)
+        ut.set_using_dict(self.setFilterResistor, value)
 
     @property
     def maxclkphaseshift(self):

python/src/detector.cpp

@@ -1097,12 +1097,12 @@ void init_det(py::module &m) {
         .def("setCDSGain",
              (void (Detector::*)(bool, sls::Positions)) & Detector::setCDSGain,
              py::arg(), py::arg() = Positions{})
-        .def("getFilter",
+        .def("getFilterResistor",
              (Result<int>(Detector::*)(sls::Positions) const) &
-                 Detector::getFilter,
+                 Detector::getFilterResistor,
              py::arg() = Positions{})
-        .def("setFilter",
+        .def("setFilterResistor",
-             (void (Detector::*)(int, sls::Positions)) & Detector::setFilter,
+             (void (Detector::*)(int, sls::Positions)) & Detector::setFilterResistor,
              py::arg(), py::arg() = Positions{})
         .def("getCurrentSource",
              (Result<bool>(Detector::*)(sls::Positions) const) &

slsDetectorServers/gotthard2DetectorServer/slsDetectorFunctionList.c

@@ -63,7 +63,7 @@ int64_t numTriggersReg = 1;
 int64_t delayReg = 0;
 int64_t numBurstsReg = 1;
 int64_t burstPeriodReg = 0;
-int filter = 0;
+int filterResistor = 0;
 int cdsGain = 0;
 int detPos[2] = {};
 
@@ -388,7 +388,7 @@ void setupDetector() {
     delayReg = 0;
     numBurstsReg = 1;
     burstPeriodReg = 0;
-    filter = 0;
+    filterResistor = 0;
     cdsGain = 0;
     memset(clkPhase, 0, sizeof(clkPhase));
     memset(dacValues, 0, sizeof(dacValues));
@@ -467,7 +467,7 @@ void setupDetector() {
         return;
     }
     setBurstMode(DEFAULT_BURST_MODE);
-    setFilter(DEFAULT_FILTER);
+    setFilterResistor(DEFAULT_FILTER_RESISTOR);
     setCDSGain(DEFAILT_CDS_GAIN);
     setSettings(DEFAULT_SETTINGS);
 
@@ -2458,7 +2458,7 @@ int setBurstMode(enum burstMode burst) {
 }
 
 int configureASICGlobalSettings() {
-    int value = ((filter << ASIC_FILTER_OFST) & ASIC_FILTER_MSK) |
+    int value = ((filterResistor << ASIC_FILTER_OFST) & ASIC_FILTER_MSK) |
                 ((cdsGain << ASIC_CDS_GAIN_OFST) & ASIC_CDS_GAIN_MSK);
     switch (burstMode) {
     case BURST_INTERNAL:
@@ -2473,9 +2473,9 @@ int configureASICGlobalSettings() {
         value |= (ASIC_CONT_MODE_MSK | ASIC_EXT_TIMING_MSK);
         break;
     }
-    LOG(logINFO, ("\tSending Global Chip settings:0x%x (filter:%d, "
+    LOG(logINFO, ("\tSending Global Chip settings:0x%x (filterResistor:%d, "
                   "cdsgain:%d)\n",
-                  value, filter, cdsGain));
+                  value, filterResistor, cdsGain));
 
     const int padding = 6; // due to address (4) to make it byte aligned
     const int lenTotalBits = padding + ASIC_GLOBAL_SETT_MAX_BITS +
@@ -2551,17 +2551,17 @@ int setCDSGain(int enable) {
 
 int getCDSGain() { return cdsGain; }
 
-int setFilter(int value) {
+int setFilterResistor(int value) {
-    if (value < 0 || value > ASIC_FILTER_MAX_VALUE) {
+    if (value < 0 || value > ASIC_FILTER_MAX_RES_VALUE) {
-        LOG(logERROR, ("Invalid filter value %d\n", value));
+        LOG(logERROR, ("Invalid filter resistor value %d\n", value));
         return FAIL;
     }
-    filter = value;
+    filterResistor = value;
-    LOG(logINFO, ("Setting Filter to %d\n", filter));
+    LOG(logINFO, ("Setting Filter Resistor to %d\n", filterResistor));
     return configureASICGlobalSettings();
 }
 
-int getFilter() { return filter; }
+int getFilterResistor() { return filterResistor; }
 
 void setCurrentSource(int value) {
     uint32_t addr = ASIC_CONFIG_REG;

slsDetectorServers/gotthard2DetectorServer/slsDetectorServer_defs.h

@@ -35,7 +35,7 @@
 
 /** Default Parameters */
 #define DEFAULT_BURST_MODE          (BURST_INTERNAL)
-#define DEFAULT_FILTER              (0)
+#define DEFAULT_FILTER_RESISTOR     (0)
 #define DEFAILT_CDS_GAIN            (0)
 #define DEFAULT_NUM_FRAMES          (1)
 #define DEFAULT_NUM_CYCLES          (1)
@@ -149,7 +149,7 @@ enum PLLINDEX { READOUT_PLL, SYSTEM_PLL };
 #define ASIC_CONT_MODE_MSK    (0x1 << ASIC_CONT_MODE_OFST)
 #define ASIC_FILTER_OFST      (3)
 #define ASIC_FILTER_MSK       (0x3 << ASIC_FILTER_OFST)
-#define ASIC_FILTER_MAX_VALUE (3)
+#define ASIC_FILTER_MAX_RES_VALUE (3)
 #define ASIC_CDS_GAIN_OFST    (5)
 #define ASIC_CDS_GAIN_MSK     (0x1 << ASIC_CDS_GAIN_OFST)
 

slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h

@@ -108,8 +108,9 @@
 // CSM mode = high current (100%), low current (16%)
 #define CONFIG_V11_STATUS_CRRNT_SRC_MODE_OFST   (19) 
 #define CONFIG_V11_STATUS_CRRNT_SRC_MODE_MSK    (0x00000001 << CONFIG_V11_STATUS_CRRNT_SRC_MODE_OFST)
-#define CONFIG_V11_STATUS_FLTR_RSSTR_OFST       (21) 
+#define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_OFST  (21) 
-#define CONFIG_V11_STATUS_FLTR_RSSTR_MSK        (0x00000001 << CONFIG_V11_STATUS_FLTR_RSSTR_OFST)
+#define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_MSK   (0x00000001 << CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_OFST)
+#define ASIC_FILTER_MAX_RES_VALUE               (1)
 #define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST  (23) 
 #define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_MSK   (0x00000001 << CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST)
 
@@ -249,8 +250,8 @@
 // CSM mode = high current (100%), low current (16%)
 #define CONFIG_V11_CRRNT_SRC_MODE_OFST      (19) 
 #define CONFIG_V11_CRRNT_SRC_MODE_MSK       (0x00000001 << CONFIG_V11_CRRNT_SRC_MODE_OFST)
-#define CONFIG_V11_FLTR_RSSTR_OFST          (21) 
+#define CONFIG_V11_FLTR_RSSTR_SMLR_OFST     (21) 
-#define CONFIG_V11_FLTR_RSSTR_MSK           (0x00000001 << CONFIG_V11_FLTR_RSSTR_OFST)
+#define CONFIG_V11_FLTR_RSSTR_SMLR_MSK      (0x00000001 << CONFIG_V11_FLTR_RSSTR_SMLR_OFST)
 #define CONFIG_V11_AUTO_MODE_OVRRD_OFST     (23) 
 #define CONFIG_V11_AUTO_MODE_OVRRD_MSK      (0x00000001 << CONFIG_V11_AUTO_MODE_OVRRD_OFST)
 

slsDetectorServers/jungfrauDetectorServer/slsDetectorFunctionList.c

@@ -474,7 +474,8 @@ void setupDetector() {
     // temp threshold and reset event
     setThresholdTemperature(DEFAULT_TMP_THRSHLD);
     setTemperatureEvent(0);
-    setFlipRows(0);
+    setFlipRows(DEFAULT_FLIP_ROWS);
+    setFilterResistor(DEFAULT_FILTER_RESISTOR);
 }
 
 int resetToDefaultDacs(int hardReset) {
@@ -2022,6 +2023,38 @@ void setFlipRows(int arg) {
     }
 }
 
+int getFilterResistor() {
+#ifdef VIRTUAL
+    uint32_t addr = CONFIG_V11_REG;
+#else
+    uint32_t addr = CONFIG_V11_STATUS_REG;
+#endif
+    // 0 for lower value, 1 for higher value
+    if (bus_r(addr) & CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_MSK) {
+        return 0;
+    }
+    return 1;
+}
+
+int setFilterResistor(int value) {
+    // lower resistor
+    if (value == 0) {
+        LOG(logINFO, ("Setting Lower Filter Resistor\n"));
+        bus_w(CONFIG_V11_REG,
+              bus_r(CONFIG_V11_REG) | CONFIG_V11_FLTR_RSSTR_SMLR_MSK);
+        return OK;
+    }
+    // higher resistor
+    else if (value == 1) {
+        LOG(logINFO, ("Setting Higher Filter Resistor\n"));
+        bus_w(CONFIG_V11_REG,
+              bus_r(CONFIG_V11_REG) & ~CONFIG_V11_FLTR_RSSTR_SMLR_MSK);
+        return OK;
+    }
+    LOG(logERROR, ("Could not set Filter Resistor. Invalid value %d\n", value));
+    return FAIL;
+}
+
 int getTenGigaFlowControl() {
     return ((bus_r(CONFIG_REG) & CONFIG_ETHRNT_FLW_CNTRL_MSK) >>
             CONFIG_ETHRNT_FLW_CNTRL_OFST);

slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h

@@ -105,12 +105,14 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS };
 #define DEFAULT_STRG_CLL_STRT         (0xf)
 #define DEFAULT_STRG_CLL_STRT_CHIP11  (0x3)
 #define DEFAULT_STRG_CLL_DLY          (0)
+#define DEFAULT_FLIP_ROWS             (0)
+#define DEFAULT_FILTER_RESISTOR       (1) // higher resistor
 
 #define HIGHVOLTAGE_MIN (60)
 #define HIGHVOLTAGE_MAX (200)
 #define DAC_MIN_MV      (0)
 #define DAC_MAX_MV      (2500)
-
+ 
 /* Defines in the Firmware */
 #define MAX_TIMESLOT_VAL            (0x1F)
 #define MAX_THRESHOLD_TEMP_VAL      (127999) // millidegrees

slsDetectorServers/slsDetectorServer/include/slsDetectorFunctionList.h

@@ -462,6 +462,8 @@ int setTemperatureEvent(int val);
 void alignDeserializer();
 int getFlipRows();
 void setFlipRows(int arg);
+int setFilterResistor(int value);
+int getFilterResistor();
 
 // eiger specific - iodelay, pulse, rate, temp, activate, delay nw parameter
 #elif EIGERD
@@ -533,8 +535,8 @@ int configureASICGlobalSettings();
 enum burstMode getBurstMode();
 int setCDSGain(int enable);
 int getCDSGain();
-int setFilter(int value);
+int setFilterResistor(int value);
-int getFilter();
+int getFilterResistor();
 void setCurrentSource(int value);
 int getCurrentSource();
 void setTimingSource(enum timingSourceType value);

slsDetectorServers/slsDetectorServer/include/slsDetectorServer_funcs.h

@@ -229,8 +229,8 @@ int set_scan(int);
 int get_scan_error_message(int);
 int get_cds_gain(int);
 int set_cds_gain(int);
-int get_filter(int);
+int get_filter_resistor(int);
-int set_filter(int);
+int set_filter_resistor(int);
 int get_adc_config(int);
 int set_adc_config(int);
 int get_bad_channels(int);

slsDetectorServers/slsDetectorServer/src/slsDetectorServer_funcs.c

@@ -354,8 +354,8 @@ void function_table() {
     flist[F_GET_SCAN_ERROR_MESSAGE] = &get_scan_error_message;
     flist[F_GET_CDS_GAIN] = &get_cds_gain;
     flist[F_SET_CDS_GAIN] = &set_cds_gain;
-    flist[F_GET_FILTER] = &get_filter;
+    flist[F_GET_FILTER_RESISTOR] = &get_filter_resistor;
-    flist[F_SET_FILTER] = &set_filter;
+    flist[F_SET_FILTER_RESISTOR] = &set_filter_resistor;
     flist[F_GET_ADC_CONFIGURATION] = &get_adc_config;
     flist[F_SET_ADC_CONFIGURATION] = &set_adc_config;
     flist[F_GET_BAD_CHANNELS] = &get_bad_channels;
@@ -7771,49 +7771,57 @@ int set_cds_gain(int file_des) {
     return Server_SendResult(file_des, INT32, NULL, 0);
 }
 
-int get_filter(int file_des) {
+int get_filter_resistor(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
     int retval = -1;
 
-    LOG(logDEBUG1, ("Getting filter\n"));
+    LOG(logDEBUG1, ("Getting filter resistor\n"));
 
-#ifndef GOTTHARD2D
+#if !defined(GOTTHAR2D) && !defined(JUNGFRAUD)
     functionNotImplemented();
 #else
     // get only
-    retval = getFilter();
+    retval = getFilterResistor();
-    LOG(logDEBUG1, ("filter retval: %u\n", retval));
+    LOG(logDEBUG1, ("filter resistor retval: %u\n", retval));
 #endif
     return Server_SendResult(file_des, INT32, &retval, sizeof(retval));
 }
 
-int set_filter(int file_des) {
+int set_filter_resistor(int file_des) {
     ret = OK;
     memset(mess, 0, sizeof(mess));
     int arg = 0;
 
     if (receiveData(file_des, &arg, sizeof(arg), INT32) < 0)
         return printSocketReadError();
-    LOG(logINFO, ("Setting filter: %u\n", arg));
+    LOG(logINFO, ("Setting filter resistor: %u\n", arg));
 
-#ifndef GOTTHARD2D
+#if !defined(GOTTHAR2D) && !defined(JUNGFRAUD)
     functionNotImplemented();
 #else
     // only set
     if (Server_VerifyLock() == OK) {
-        if (arg < 0 || arg > ASIC_FILTER_MAX_VALUE) {
+        if (arg < 0 || arg > ASIC_FILTER_MAX_RES_VALUE) {
             ret = FAIL;
             sprintf(mess,
-                    "Could not set filter. Invalid filter %d. "
+                    "Could not set filter resistor. Invalid filter argument %d. "
                     "Options [0-%d]\n",
-                    arg, ASIC_FILTER_MAX_VALUE);
+                    arg, ASIC_FILTER_MAX_RES_VALUE);
             LOG(logERROR, (mess));
         } else {
-            setFilter(arg);
+            ret = setFilterResistor(arg);
-            int retval = getFilter();
+            if (ret == FAIL) {
-            LOG(logDEBUG1, ("filter retval: %u\n", retval));
+                ret = FAIL;
-            validate(&ret, mess, arg, retval, "set filter", DEC);
+                strcpy(mess, "Could not set filter resistor.\n");
+                LOG(logERROR, (mess));                
+            }
+#ifndef JUNGFRAUD
+            // jungfrau might take time to update status register if acquiring
+            int retval = getFilterResistor();
+            LOG(logDEBUG1, ("filter resistor retval: %u\n", retval));
+            validate(&ret, mess, arg, retval, "set filter resistor", DEC);
+#endif
         }
     }
 #endif

slsDetectorSoftware/src/Detector.cpp

@@ -699,6 +699,14 @@ void Detector::setParallelMode(bool value, Positions pos) {
     pimpl->Parallel(&Module::setParallelMode, pos, value);
 }
 
+Result<int> Detector::getFilterResistor(Positions pos) const {
+    return pimpl->Parallel(&Module::getFilterResistor, pos);
+}
+
+void Detector::setFilterResistor(int value, Positions pos) {
+    pimpl->Parallel(&Module::setFilterResistor, pos, value);
+}
+
 // Acquisition
 
 void Detector::acquire() { pimpl->acquire(); }
@@ -1604,14 +1612,6 @@ void Detector::setCDSGain(bool value, Positions pos) {
     pimpl->Parallel(&Module::setCDSGain, pos, value);
 }
 
-Result<int> Detector::getFilter(Positions pos) const {
-    return pimpl->Parallel(&Module::getFilter, pos);
-}
-
-void Detector::setFilter(int value, Positions pos) {
-    pimpl->Parallel(&Module::setFilter, pos, value);
-}
-
 Result<bool> Detector::getCurrentSource(Positions pos) const {
     return pimpl->Parallel(&Module::getCurrentSource, pos);
 }

slsDetectorSoftware/src/Module.cpp

@@ -704,6 +704,14 @@ void Module::setParallelMode(const bool enable) {
     sendToDetector(F_SET_PARALLEL_MODE, static_cast<int>(enable), nullptr);
 }
 
+int Module::getFilterResistor() const {
+    return sendToDetector<int>(F_GET_FILTER_RESISTOR);
+}
+
+void Module::setFilterResistor(int value) {
+    sendToDetector(F_SET_FILTER_RESISTOR, value, nullptr);
+}
+
 // Acquisition
 
 void Module::startReceiver() {
@@ -1898,12 +1906,6 @@ void Module::setCDSGain(bool value) {
     sendToDetector(F_SET_CDS_GAIN, static_cast<int>(value), nullptr);
 }
 
-int Module::getFilter() const { return sendToDetector<int>(F_GET_FILTER); }
-
-void Module::setFilter(int value) {
-    sendToDetector(F_SET_FILTER, value, nullptr);
-}
-
 bool Module::getCurrentSource() const {
     return sendToDetector<int>(F_GET_CURRENT_SOURCE);
 }

slsDetectorSoftware/src/Module.h

@@ -170,6 +170,8 @@ class Module : public virtual slsDetectorDefs {
     void setExternalSignalFlags(int signalIndex, externalSignalFlag type);
     bool getParallelMode() const;
     void setParallelMode(const bool enable);
+    int getFilterResistor() const;
+    void setFilterResistor(int value);
 
     /**************************************************
      *                                                *
@@ -408,8 +410,6 @@ class Module : public virtual slsDetectorDefs {
     void setBurstMode(burstMode value);
     bool getCDSGain() const;
     void setCDSGain(bool value);
-    int getFilter() const;
-    void setFilter(int value);
     bool getCurrentSource() const;
     void setCurrentSource(bool value);
     slsDetectorDefs::timingSourceType getTimingSource() const;

slsDetectorSoftware/tests/test-CmdProxy-gotthard2.cpp

@@ -519,36 +519,6 @@ TEST_CASE("cdsgain", "[.cmd]") {
     }
 }
 
-TEST_CASE("filter", "[.cmd]") {
-    Detector det;
-    CmdProxy proxy(&det);
-    auto det_type = det.getDetectorType().squash();
-
-    if (det_type == defs::GOTTHARD2) {
-        auto prev_val = det.getFilter();
-        {
-            std::ostringstream oss;
-            proxy.Call("filter", {"1"}, -1, PUT, oss);
-            REQUIRE(oss.str() == "filter 1\n");
-        }
-        {
-            std::ostringstream oss;
-            proxy.Call("filter", {"0"}, -1, PUT, oss);
-            REQUIRE(oss.str() == "filter 0\n");
-        }
-        {
-            std::ostringstream oss;
-            proxy.Call("filter", {}, -1, GET, oss);
-            REQUIRE(oss.str() == "filter 0\n");
-        }
-        for (int i = 0; i != det.size(); ++i) {
-            det.setFilter(prev_val[i], {i});
-        }
-    } else {
-        REQUIRE_THROWS(proxy.Call("filter", {}, -1, GET));
-    }
-}
-
 TEST_CASE("currentsource", "[.cmd]") {
     Detector det;
     CmdProxy proxy(&det);

slsDetectorSoftware/tests/test-CmdProxy.cpp

@@ -1379,6 +1379,43 @@ TEST_CASE("parallel", "[.cmd]") {
     }
 }
 
+TEST_CASE("filterresistor", "[.cmd]") {
+    Detector det;
+    CmdProxy proxy(&det);
+    auto det_type = det.getDetectorType().squash();
+
+    if (det_type == defs::GOTTHARD2 || det_type == defs::JUNGFRAU) {
+        auto prev_val = det.getFilterResistor();
+        {
+            std::ostringstream oss;
+            proxy.Call("filterresistor", {"1"}, -1, PUT, oss);
+            REQUIRE(oss.str() == "filterresistor 1\n");
+        }
+        {
+            std::ostringstream oss;
+            proxy.Call("filterresistor", {"0"}, -1, PUT, oss);
+            REQUIRE(oss.str() == "filterresistor 0\n");
+        }
+        {
+            std::ostringstream oss;
+            proxy.Call("filterresistor", {}, -1, GET, oss);
+            REQUIRE(oss.str() == "filterresistor 0\n");
+        }
+        if (det_type == defs::GOTTHARD2) {
+            REQUIRE_NOTHROW(proxy.Call("filterresistor", {"2"}, -1, PUT));
+            REQUIRE_NOTHROW(proxy.Call("filterresistor", {"3"}, -1, PUT));
+        } else {
+            REQUIRE_THROWS(proxy.Call("filterresistor", {"2"}, -1, PUT));
+            REQUIRE_THROWS(proxy.Call("filterresistor", {"3"}, -1, PUT));
+        }
+        for (int i = 0; i != det.size(); ++i) {
+            det.setFilterResistor(prev_val[i], {i});
+        }
+    } else {
+        REQUIRE_THROWS(proxy.Call("filterresistor", {}, -1, GET));
+    }
+}
+
 /** temperature */
 
 TEST_CASE("templist", "[.cmd]") {

slsSupportLib/include/sls/sls_detector_funcs.h

@@ -205,8 +205,8 @@ enum detFuncs {
     F_GET_SCAN_ERROR_MESSAGE,
     F_GET_CDS_GAIN,
     F_SET_CDS_GAIN,
-    F_GET_FILTER,
+    F_GET_FILTER_RESISTOR,
-    F_SET_FILTER,
+    F_SET_FILTER_RESISTOR,
     F_GET_ADC_CONFIGURATION,
     F_SET_ADC_CONFIGURATION,
     F_GET_BAD_CHANNELS,
@@ -552,8 +552,8 @@ const char* getFunctionNameFromEnum(enum detFuncs func) {
     case F_GET_SCAN_ERROR_MESSAGE:          return "F_GET_SCAN_ERROR_MESSAGE"; 
     case F_GET_CDS_GAIN:                    return "F_GET_CDS_GAIN";
     case F_SET_CDS_GAIN:                    return "F_SET_CDS_GAIN";
-    case F_GET_FILTER:                      return "F_GET_FILTER";
+    case F_GET_FILTER_RESISTOR:             return "F_GET_FILTER_RESISTOR";
-    case F_SET_FILTER:                      return "F_SET_FILTER";
+    case F_SET_FILTER_RESISTOR:             return "F_SET_FILTER_RESISTOR";
     case F_SET_ADC_CONFIGURATION:           return "F_SET_ADC_CONFIGURATION";       
     case F_GET_ADC_CONFIGURATION:           return "F_GET_ADC_CONFIGURATION";       
     case F_GET_BAD_CHANNELS:                return "F_GET_BAD_CHANNELS";