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

more ctb

Browse Source
This commit is contained in:
Erik Frojdh
2019-08-08 10:18:21 +02:00
parent bba6e1667b
commit 095a7eac05
5 changed files with 103 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
slsDetectorSoftware/include/Detector.h
View File

@ -209,29 +209,44 @@ class Detector {
*/
Result<std::string> getDetectorTypeAsString(Positions pos = {}) const;
// Erik
/** CTB only.Sets the mask applied to every pattern. */
void setPatternMask(uint64_t mask, Positions pos = {});
/** CTB only. Gets the mask applied to every pattern. */
Result<uint64_t> getPatternMask(Positions pos = {});
/**
* Set LED Enable for CTB
* CTB only. Sets the bitmask that the mask will be applied to for every
* pattern.
* @param mask mask to select bits
*/
void setPatternBitMask(uint64_t mask, Positions pos = {});
/**
* CTB only. Gets the bits that the mask will be applied to for every
* pattern
*/
Result<uint64_t> getPatternBitMask(Positions pos = {}) const;
/**
* CTB only. Enable or disable the LED
* @param enable true to switch on, false to switch off
*/
void setLEDEnable(bool enable, Positions pos = {});
/**
* Get LED enable for CTB
* CTB only. Get LED enable.
*/
Result<bool> getLEDEnable(Positions pos = {}) const;
/**
* Set Digital IO Delay CTB
* CTB only. Set Digital IO Delay
* @param digital IO mask to select the pins
* @param delay delay in ps(1 bit=25ps, max of 775 ps)
*/
void setDigitalIODelay(uint64_t pinMask, int delay, Positions pos = {});
};
} // namespace sls

15
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -2106,14 +2106,14 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param mask mask to be applied
* @param detPos -1 for all detectors in list or specific detector position
*/
void setPatternMask(uint64_t mask, int detPos = -1);
void setPatternMask(uint64_t mask, int detPos = -1); //
/**
* Gets the mask applied to every pattern (CTB/ Moench)
* @param detPos -1 for all detectors in list or specific detector position
* @returns mask set
*/
uint64_t getPatternMask(int detPos = -1);
uint64_t getPatternMask(int detPos = -1); //
/**
* Selects the bits that the mask will be applied to for every pattern (CTB/
@ -2121,7 +2121,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param mask mask to select bits
* @param detPos -1 for all detectors in list or specific detector position
*/
void setPatternBitMask(uint64_t mask, int detPos = -1);
void setPatternBitMask(uint64_t mask, int detPos = -1);//
/**
* Gets the bits that the mask will be applied to for every pattern (CTB/
@ -2129,7 +2129,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns mask of bits selected
*/
uint64_t getPatternBitMask(int detPos = -1);
uint64_t getPatternBitMask(int detPos = -1);//
/**
* Set LED Enable (Moench, CTB only)
@ -2137,7 +2137,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns LED enable
*/
int setLEDEnable(int enable = -1, int detPos = -1);
int setLEDEnable(int enable = -1, int detPos = -1); //
/**
* Set Digital IO Delay (Moench, CTB only)
@ -2145,7 +2145,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param delay delay in ps(1 bit=25ps, max of 775 ps)
* @param detPos -1 for all detectors in list or specific detector position
*/
void setDigitalIODelay(uint64_t pinMask, int delay, int detPos = -1);
void setDigitalIODelay(uint64_t pinMask, int delay, int detPos = -1); //
/**
* Loads the detector setup from file
@ -2209,8 +2209,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* or just gives progress of acquisition by polling receivers
*/
void processData();
void addSlsDetector(std::unique_ptr<slsDetector> det);
private:
/**