diff --git a/python/slsdet/detector.py b/python/slsdet/detector.py index a2a7ff92e..5b7d67e1f 100755 --- a/python/slsdet/detector.py +++ b/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): """ diff --git a/python/src/detector.cpp b/python/src/detector.cpp index 763b47f6c..322a4ca49 100644 --- a/python/src/detector.cpp +++ b/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)) & - Detector::setFlipRows, + (void (Detector::*)(bool, sls::Positions)) & Detector::setFlipRows, py::arg(), py::arg() = Positions{}) .def("getRateCorrection", (Result(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, - py::arg(), py::arg() = Positions{}) - .def("getFilterCell", - (Result(Detector::*)(sls::Positions) const) & - Detector::getFilterCell, - py::arg() = Positions{}) - .def("setFilterCell", - (void (Detector::*)(int, sls::Positions)) & Detector::setFilterCell, + (void (Detector::*)(int, sls::Positions)) & + Detector::setFilterResistor, py::arg(), py::arg() = Positions{}) .def("getCurrentSource", (Result(Detector::*)(sls::Positions) const) & diff --git a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h index 704389cbc..1baf7c9c7 100644 --- a/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h +++ b/slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h @@ -110,7 +110,6 @@ #define CONFIG_V11_STATUS_CRRNT_SRC_MODE_MSK (0x00000001 << CONFIG_V11_STATUS_CRRNT_SRC_MODE_OFST) #define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_OFST (21) #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) diff --git a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h index 91b63a7d7..6ec1e4187 100644 --- a/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h +++ b/slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h @@ -122,6 +122,7 @@ enum CLKINDEX { RUN_CLK, ADC_CLK, DBIT_CLK, NUM_CLOCKS }; #define MAX_STORAGE_CELL_CHIP11_VAL (3) #define MAX_STORAGE_CELL_DLY_NS_VAL (ASIC_CTRL_EXPSRE_TMR_MAX_VAL) #define ACQ_TIME_MIN_CLOCK (2) +#define ASIC_FILTER_MAX_RES_VALUE (1) #define MAX_PHASE_SHIFTS (240) #define BIT16_MASK (0xFFFF) diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index e5e36735c..394d77a09 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -1521,14 +1521,6 @@ void Detector::setGainMode(const defs::gainMode mode, Positions pos) { pimpl->Parallel(&Module::setGainMode, pos, mode); } -Result 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 Detector::getROI(Positions pos) const {