merge bugs

python/slsdet/detector.py

@@ -2254,21 +2254,6 @@ class Detector(CppDetectorApi):
     def filterresistor(self, value):
         ut.set_using_dict(self.setFilterResistor, value)
 
-    @property
-    @element
-    def filtercell(self):
-        """
-        [Jungfrau] Set filter capacitor. 
-        Note
-        ----
-        [Jungfrau] Options: 0-12. Default: 0. Advanced user command.
-        """
-        return self.getFilterCell()
-
-    @filtercell.setter
-    def filtercell(self, value):
-        ut.set_using_dict(self.setFilterCell, value)
-
     @property
     def maxclkphaseshift(self):
         """

python/src/detector.cpp

@@ -853,8 +853,7 @@ void init_det(py::module &m) {
                  Detector::getFlipRows,
              py::arg() = Positions{})
         .def("setFlipRows",
-             (void (Detector::*)(bool, sls::Positions)) &
+             (void (Detector::*)(bool, sls::Positions)) & Detector::setFlipRows,
-                 Detector::setFlipRows,
              py::arg(), py::arg() = Positions{})
         .def("getRateCorrection",
              (Result<sls::ns>(Detector::*)(sls::Positions) const) &
@@ -1102,14 +1101,8 @@ void init_det(py::module &m) {
                  Detector::getFilterResistor,
              py::arg() = Positions{})
         .def("setFilterResistor",
-             (void (Detector::*)(int, sls::Positions)) & Detector::setFilterResistor,
+             (void (Detector::*)(int, sls::Positions)) &
-             py::arg(), py::arg() = Positions{})
+                 Detector::setFilterResistor,
-        .def("getFilterCell",
-             (Result<int>(Detector::*)(sls::Positions) const) &
-                 Detector::getFilterCell,
-             py::arg() = Positions{})
-        .def("setFilterCell",
-             (void (Detector::*)(int, sls::Positions)) & Detector::setFilterCell,
              py::arg(), py::arg() = Positions{})
         .def("getCurrentSource",
              (Result<bool>(Detector::*)(sls::Positions) const) &

slsDetectorSoftware/src/Detector.cpp

@@ -1521,14 +1521,6 @@ 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);
-}
-
-void Detector::setFilterCell(int cell, Positions pos) {
-    pimpl->Parallel(&Module::setFilterCell, pos, cell);
-}
-
 // Gotthard Specific
 
 Result<defs::ROI> Detector::getROI(Positions pos) const {