mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-06-23 10:07:59 +02:00
Guidetector (#54)
* WIP * dacWidget * main WIP * advanced WIP * WIP * WIP * WIP * WIP * WIP * WIP * works * updated gui to chrono * review fixes * unitque ptrs in gui
This commit is contained in:
@ -61,7 +61,7 @@ class Detector {
|
||||
Result<int64_t> getReceiverVersion(Positions pos = {}) const;
|
||||
|
||||
Result<defs::detectorType> getDetectorType(Positions pos = {}) const;
|
||||
|
||||
|
||||
/** Gets the total number of detectors */
|
||||
int size() const;
|
||||
|
||||
@ -233,7 +233,7 @@ class Detector {
|
||||
*/
|
||||
void stopAcquisition();
|
||||
|
||||
/**
|
||||
/** TODO: initially was getting acq flag, if set, check if detctor idle, then set, else exception & abort
|
||||
* Clears the acquiring flag. This has to be done manually
|
||||
* after an acquisition was aborted.
|
||||
*/
|
||||
@ -249,7 +249,7 @@ class Detector {
|
||||
Result<uint64_t> getStartingFrameNumber(Positions pos = {}) const;
|
||||
|
||||
/** [Eiger][Jungfrau] */
|
||||
void setStartingFrameNumber(uint64_t value, Positions pos);
|
||||
void setStartingFrameNumber(uint64_t value, Positions pos = {});
|
||||
|
||||
/** [Eiger] Sends an internal software trigger to the detector */
|
||||
void sendSoftwareTrigger(Positions pos = {});
|
||||
@ -655,10 +655,12 @@ class Detector {
|
||||
/** [Eiger] deadtime in ns, 0 = disabled */
|
||||
Result<ns> getRateCorrection(Positions pos = {}) const;
|
||||
|
||||
/** [Eiger] Sets default rate correction from trimbit file */
|
||||
void setDefaultRateCorrection(Positions pos = {});
|
||||
|
||||
/** //TODO: default, get, set
|
||||
* [Eiger] Set Rate correction
|
||||
* 0 disable correction, < 0: default dead time from trimbit file, > 0
|
||||
* custom deadtime (advanced)
|
||||
* 0 disable correction, > 0 custom deadtime, cannot be -1
|
||||
*/
|
||||
void setRateCorrection(ns dead_time, Positions pos = {});
|
||||
|
||||
|
@ -1552,11 +1552,16 @@ class multiSlsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
int setAutoComparatorDisableMode(int ival = -1, int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Set Default Rate correction from trimbit file ( Eiger)
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void setDefaultRateCorrection(int detPos = -1); //
|
||||
|
||||
/**
|
||||
* Set Rate correction ( Eiger)
|
||||
* @param t dead time in ns - if 0 disable correction,
|
||||
* if >0 set dead time to t, if < 0 set deadtime to default dead time
|
||||
* for current settings
|
||||
* if >0 set dead time to t, cannot be < 0
|
||||
* @param detPos -1 for all detectors in list or specific detector position
|
||||
*/
|
||||
void setRateCorrection(int64_t t = 0, int detPos = -1); //
|
||||
|
@ -1280,10 +1280,15 @@ class slsDetector : public virtual slsDetectorDefs {
|
||||
*/
|
||||
sls_detector_module getModule();
|
||||
|
||||
/**
|
||||
* Set Default Rate correction from trimbit file(Eiger)
|
||||
*/
|
||||
void setDefaultRateCorrection();
|
||||
|
||||
/**
|
||||
* Set Rate correction (Eiger)
|
||||
* @param t dead time in ns - if 0 disable correction,
|
||||
* if >0 set dead time to t, if < 0 set deadtime to default dead time
|
||||
* if >0 set dead time to t, cannot be < 0
|
||||
* for current settings
|
||||
*/
|
||||
void setRateCorrection(int64_t t = 0);
|
||||
|
Reference in New Issue
Block a user