detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-01-16 08:09:21 +01:00
Code Issues Actions Packages Releases Activity

Merge branch 'developer' into gui

Browse Source
This commit is contained in:
maliakal_d
2019-06-04 12:18:20 +02:00
parent d076be8887 3aea917175
commit ffbc0a0fc3
14 changed files with 80 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/include/multiSlsDetector.h
View File

@@ -828,13 +828,12 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* Set/get external signal flags (to specify triggerinrising edge etc)
* (Gotthard, Mythen)
* @param pol external signal flag (-1 gets)
* @param signalindex singal index (0 - 3)
* @param detPos -1 for all detectors in list or specific detector position
* @returns current timing mode
*/
externalSignalFlag
setExternalSignalFlags(externalSignalFlag pol = GET_EXTERNAL_SIGNAL_FLAG,
int signalindex = 0, int detPos = -1);
int detPos = -1);
/**
* Set/get readout flags (Eiger, Mythen)

3
slsDetectorSoftware/include/slsDetector.h
View File

@@ -814,10 +814,9 @@ class slsDetector : public virtual slsDetectorDefs{
/**
* Set/get external signal flags (to specify triggerinrising edge etc) (Gotthard, Mythen)
* @param pol external signal flag (-1 gets)
* @param signalindex singal index (0 - 3)
* @returns current timing mode
*/
externalSignalFlag setExternalSignalFlags(externalSignalFlag pol = GET_EXTERNAL_SIGNAL_FLAG, int signalindex = 0);
externalSignalFlag setExternalSignalFlags(externalSignalFlag pol = GET_EXTERNAL_SIGNAL_FLAG);
/**
* Set/get readout flags (Eiger, Mythen)