detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27:14 +02:00
Code Issues Actions Packages Releases Activity

Merge branch 'jungfrau1.1' into j14filtercell

Browse Source
This commit is contained in:
maliakal_d
2021-08-09 12:04:24 +02:00
parent 7552ea1e75 2a5fb9db57
commit 3ca4c94b32
5 changed files with 4 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
python/slsdet/detector.py
View File

@ -2254,21 +2254,6 @@ class Detector(CppDetectorApi):
def filterresistor(self, value): def filterresistor(self, value):
ut.set_using_dict(self.setFilterResistor, 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 @property
def maxclkphaseshift(self): def maxclkphaseshift(self):
""" """

13
python/src/detector.cpp
View File

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

1
slsDetectorServers/jungfrauDetectorServer/RegisterDefs.h
View File

@ -110,7 +110,6 @@
#define CONFIG_V11_STATUS_CRRNT_SRC_MODE_MSK (0x00000001 << CONFIG_V11_STATUS_CRRNT_SRC_MODE_OFST) #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_OFST (21)
#define CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_MSK (0x00000001 << CONFIG_V11_STATUS_FLTR_RSSTR_SMLR_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_OFST (23)
#define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_MSK (0x00000001 << CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST) #define CONFIG_V11_STATUS_AUTO_MODE_OVRRD_MSK (0x00000001 << CONFIG_V11_STATUS_AUTO_MODE_OVRRD_OFST)

1
slsDetectorServers/jungfrauDetectorServer/slsDetectorServer_defs.h
View File

@ -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_CHIP11_VAL (3)
#define MAX_STORAGE_CELL_DLY_NS_VAL (ASIC_CTRL_EXPSRE_TMR_MAX_VAL) #define MAX_STORAGE_CELL_DLY_NS_VAL (ASIC_CTRL_EXPSRE_TMR_MAX_VAL)
#define ACQ_TIME_MIN_CLOCK (2) #define ACQ_TIME_MIN_CLOCK (2)
#define ASIC_FILTER_MAX_RES_VALUE (1)
#define MAX_PHASE_SHIFTS (240) #define MAX_PHASE_SHIFTS (240)
#define BIT16_MASK (0xFFFF) #define BIT16_MASK (0xFFFF)

8
slsDetectorSoftware/src/Detector.cpp
View File

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