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

WIP

Browse Source
This commit is contained in:
maliakal_d
2019-08-16 17:38:41 +02:00
parent d3e60eba80
commit a0bdfcdae3
24 changed files with 62 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
slsDetectorSoftware/include/Detector.h
View File

@ -162,15 +162,13 @@ class Detector {
void setDAC(int value, defs::dacIndex index, bool mV, Positions pos = {});
//TODO: rename externalCommunicationMode: timingMode
Result<defs::externalCommunicationMode>
getTimingMode(Positions pos = {}) const;
Result<defs::timingMode> getTimingMode(Positions pos = {}) const;
/**
* [Gotthard, Jungfrau, CTB Options: AUTO_TIMING, TRIGGER_EXPOSURE]
* [Eiger Options: AUTO_TIMING, TRIGGER_EXPOSURE, GATED, BURST_TRIGGER]
*/
void setTimingMode(defs::externalCommunicationMode value,
void setTimingMode(defs::timingMode value,
Positions pos = {});

4
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -763,9 +763,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns current timing mode
*/
externalCommunicationMode setExternalCommunicationMode(
externalCommunicationMode pol = GET_EXTERNAL_COMMUNICATION_MODE,
int detPos = -1);//
timingMode setTimingMode(timingMode pol = GET_TIMING_MODE, int detPos = -1);//
/**
* Set/get external signal flags (to specify triggerinrising edge etc)

3
slsDetectorSoftware/include/slsDetector.h
View File

@ -618,8 +618,7 @@ class slsDetector : public virtual slsDetectorDefs {
* @param pol timing mode (-1 gets)
* @returns current timing mode
*/
externalCommunicationMode setExternalCommunicationMode(
externalCommunicationMode pol = GET_EXTERNAL_COMMUNICATION_MODE);
timingMode setTimingMode(timingMode pol = GET_TIMING_MODE);
/**
* Set/get external signal flags (to specify triggerinrising edge etc)

2
slsDetectorSoftware/include/slsDetectorUsers.h
View File

@ -385,7 +385,7 @@ public:
/**
* Set/get timing mode
* @param pol timing mode (-1 gets)
* Options (slsDetectorDefs::externalCommunicationMode)
* Options (slsDetectorDefs::timingMode)
* (Eiger: AUTO_TIMING, TRIGGER_EXPOSURE, BURST_TRIGGER, GATED)
* (Jungfrau: AUTO_TIMING, TRIGGER_EXPOSURE)
* (Gotthard: AUTO_TIMING, TRIGGER_EXPOSURE)