wip

python/slsdet/detector.py

@@ -2242,7 +2242,9 @@ class Detector(CppDetectorApi):
         """[Gotthard2] Set filter resistor. 
         Note
         ----
-        Default is 0. Options: 0-3.
+        Advanced user command.
+        [Gotthard2] Default is 0. Options: 0-3.
+        [Jungfrau] Default is 1. Options: 0-1.
         """
         return self.getFilter()
 
@@ -2250,6 +2252,21 @@ class Detector(CppDetectorApi):
     def filter(self, value):
         ut.set_using_dict(self.setFilter, 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

@@ -1104,6 +1104,13 @@ void init_det(py::module &m) {
         .def("setFilter",
              (void (Detector::*)(int, sls::Positions)) & Detector::setFilter,
              py::arg(), py::arg() = Positions{})
+        .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) &
                  Detector::getCurrentSource,

slsDetectorSoftware/src/Detector.cpp

@@ -1513,6 +1513,14 @@ 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 {

slsDetectorSoftware/src/Module.h

@@ -373,7 +373,9 @@ class Module : public virtual slsDetectorDefs {
     void setStorageCellDelay(int64_t value);
     gainMode getGainMode() const;
     void setGainMode(const gainMode mode);
-
+  int getStorageCellStart() const;
+    void setStorageCellStart(int pos);
+    
     /**************************************************
      *                                                *
      *    Gotthard Specific                           *