diff --git a/slsDetectorSoftware/include/Detector.h b/slsDetectorSoftware/include/Detector.h index 0d9053c02..47fff64f5 100644 --- a/slsDetectorSoftware/include/Detector.h +++ b/slsDetectorSoftware/include/Detector.h @@ -411,7 +411,8 @@ class Detector { * @param tb 1 to include trimbits, 0 to exclude * @param pos detector position */ - void setThresholdEnergy(int value, defs::detectorSettings sett = defs::GET_SETTINGS, + void setThresholdEnergy(int value, + defs::detectorSettings sett = defs::GET_SETTINGS, int tb = 1, Positions pos = {}); /** @@ -707,7 +708,7 @@ class Detector { /** [Eiger] */ void pulseChip(int n, Positions pos = {}); - /** + /** * [Eiger] Pulse Pixel and move by a relative value * @param n is number of times to pulse * @param x is relative x value @@ -730,13 +731,25 @@ class Detector { /** [Eiger] Set the energies where the detector is trimmed */ void setTrimEn(std::vector energies, Positions pos = {}); - /** - * [Eiger] not 4 bit mode + /** + * [Eiger] not 4 bit mode * Fills in gap pixels in data - */ + */ void setGapPixelsEnable(bool enable, Positions pos = {}); Result getGapPixelEnable(Positions pos = {}) const; + + /**[Eiger] */ + void setAllTrimbits(int value, Positions pos = {}); + + /** [Eiger] TODO! only Eiger? */ + void setFlippedData(defs::dimension d, bool flipped, Positions pos = {}); + + Result getFlippedData(defs::dimension d, Positions pos = {}) const; + + void setRxPadDeactivatedMod(bool pad, Positions pos = {}); + + Result getRxPadDeactivatedMod(Positions pos = {}) const; }; } // namespace sls \ No newline at end of file diff --git a/slsDetectorSoftware/include/multiSlsDetector.h b/slsDetectorSoftware/include/multiSlsDetector.h index 11eb78113..ae04851fc 100755 --- a/slsDetectorSoftware/include/multiSlsDetector.h +++ b/slsDetectorSoftware/include/multiSlsDetector.h @@ -1564,7 +1564,7 @@ class multiSlsDetector : public virtual slsDetectorDefs { * @param detPos -1 for all detectors in list or specific detector position * @returns 1 for flipped, else 0 */ - int getFlippedData(dimension d = X, int detPos = -1); + int getFlippedData(dimension d = X, int detPos = -1); // /** * Sets the enable which determines if @@ -1574,7 +1574,7 @@ class multiSlsDetector : public virtual slsDetectorDefs { * @param detPos -1 for all detectors in list or specific detector position * @returns enable flipped data across x or y axis */ - int setFlippedData(dimension d = X, int value = -1, int detPos = -1); + int setFlippedData(dimension d = X, int value = -1, int detPos = -1); // /** * Sets all the trimbits to a particular value (Eiger) @@ -1582,7 +1582,7 @@ class multiSlsDetector : public virtual slsDetectorDefs { * @param detPos -1 for all detectors in list or specific detector position * @returns OK or FAIL */ - int setAllTrimbits(int val, int detPos = -1); + int setAllTrimbits(int val, int detPos = -1); // /** * Enable gap pixels, only for Eiger and for 8,16 and 32 bit mode. (Eiger) @@ -1590,7 +1590,7 @@ class multiSlsDetector : public virtual slsDetectorDefs { * @param val 1 sets, 0 unsets, -1 gets * @returns gap pixel enable or -1 for error */ - int enableGapPixels(int val = -1, int detPos = -1); + int enableGapPixels(int val = -1, int detPos = -1); // /** * Sets the number of trim energies and their value (Eiger) diff --git a/slsDetectorSoftware/src/Detector.cpp b/slsDetectorSoftware/src/Detector.cpp index 17652bedd..26fdfb559 100644 --- a/slsDetectorSoftware/src/Detector.cpp +++ b/slsDetectorSoftware/src/Detector.cpp @@ -290,7 +290,8 @@ Result Detector::getThresholdEnergy(Positions pos) const { return pimpl->Parallel(&slsDetector::getThresholdEnergy, pos); } -void Detector::setThresholdEnergy(int value, defs::detectorSettings sett, int tb, Positions pos) { +void Detector::setThresholdEnergy(int value, defs::detectorSettings sett, + int tb, Positions pos) { pimpl->Parallel(&slsDetector::setThresholdEnergy, pos, value, sett, tb); } @@ -589,32 +590,55 @@ Result Detector::getThresholdTemperature(Positions pos) const { return pimpl->Parallel(&slsDetector::setThresholdTemperature, pos, -1); } -void Detector::pulseChip(int n, Positions pos){ +void Detector::pulseChip(int n, Positions pos) { pimpl->Parallel(&slsDetector::pulseChip, pos, n); } -void Detector::pulsePixelNMove(int n, int x, int y, Positions pos){ +void Detector::pulsePixelNMove(int n, int x, int y, Positions pos) { pimpl->Parallel(&slsDetector::pulsePixelNMove, pos, n, x, y); } -void Detector::pulsePixel(int n, int x, int y, Positions pos){ +void Detector::pulsePixel(int n, int x, int y, Positions pos) { pimpl->Parallel(&slsDetector::pulsePixel, pos, n, x, y); } -Result> Detector::getTrimEn(Positions pos) const{ +Result> Detector::getTrimEn(Positions pos) const { return pimpl->Parallel(&slsDetector::getTrimEn, pos); } -void Detector::setTrimEn(std::vector energies, Positions pos){ +void Detector::setTrimEn(std::vector energies, Positions pos) { pimpl->Parallel(&slsDetector::setTrimEn, pos, energies); } -void Detector::setGapPixelsEnable(bool enable, Positions pos){ - pimpl->Parallel(&slsDetector::enableGapPixels, pos, static_cast(enable)); +void Detector::setGapPixelsEnable(bool enable, Positions pos) { + pimpl->Parallel(&slsDetector::enableGapPixels, pos, + static_cast(enable)); } -Result Detector::getGapPixelEnable(Positions pos) const{ +Result Detector::getGapPixelEnable(Positions pos) const { return pimpl->Parallel(&slsDetector::enableGapPixels, pos, -1); } +void Detector::setAllTrimbits(int value, Positions pos) { + pimpl->Parallel(&slsDetector::setAllTrimbits, pos, value); +} + +void Detector::setFlippedData(defs::dimension d, bool flipped, Positions pos) { + pimpl->Parallel(&slsDetector::setFlippedData, pos, d, + static_cast(flipped)); +} + +Result Detector::getFlippedData(defs::dimension d, Positions pos) const { + return pimpl->Parallel(&slsDetector::getFlippedData, pos, d); +} + +void Detector::setRxPadDeactivatedMod(bool pad, Positions pos) { + pimpl->Parallel(&slsDetector::setDeactivatedRxrPaddingMode, pos, + static_cast(pad)); +} + +Result Detector::getRxPadDeactivatedMod(Positions pos) const { + return pimpl->Parallel(&slsDetector::setDeactivatedRxrPaddingMode, pos, -1); +} + } // namespace sls \ No newline at end of file