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

filter cell (only chipv1.1)

Browse Source
This commit is contained in:
maliakal_d
2021-08-06 14:42:41 +02:00
parent 0a58f13fe1
commit 2934ccbf2c
13 changed files with 147 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/Detector.cpp
View File

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

8
slsDetectorSoftware/src/Module.cpp
View File

@ -1632,6 +1632,14 @@ void Module::setGainMode(const slsDetectorDefs::gainMode mode) {
sendToDetector(F_SET_GAIN_MODE, mode, nullptr);
}
int Module::getFilterCell() const {
return sendToDetector<int>(F_GET_FILTER_CELL);
}
void Module::setFilterCell(int value) {
sendToDetector(F_SET_FILTER_CELL, value, nullptr);
}
// Gotthard Specific
slsDetectorDefs::ROI Module::getROI() const {

4
slsDetectorSoftware/src/Module.h
View File

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

3
slsDetectorSoftware/tests/test-CmdProxy-jungfrau.cpp
View File

@ -496,8 +496,7 @@ TEST_CASE("filtercell", "[.cmd]") {
if (det_type == defs::JUNGFRAU) {
// chip version 1.1
if (det.getChipVersion().squash() * 10 == 11) {
auto prev_val = det.getFilterCell().tsquash(
"inconsistent #additional storage cells to test");
auto prev_val = det.getFilterCell();
{
std::ostringstream oss;
proxy.Call("filtercell", {"1"}, -1, PUT, oss);