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

WIP done

Browse Source
This commit is contained in:
maliakal_d
2019-08-09 17:19:12 +02:00
parent cac353748e
commit b2d39d4785
10 changed files with 142 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
slsDetectorSoftware/include/Detector.h
View File

@ -908,6 +908,54 @@ class Detector {
void setDAC(int value, defs::dacIndex index, bool mV, Positions pos = {});
Result<defs::externalCommunicationMode> 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, Positions pos = {});
/**
* (Gotthard)
*/
Result<defs::externalSignalFlag> getExternalSignalFlags(Positions pos = {}) const;
/**
* (Gotthard Options: TRIGGER_IN_RISING_EDGE, TRIGGER_IN_FALLING_EDGE)
*/
void setExternalSignalFlags(defs::externalSignalFlag value, Positions pos = {});
/**
* (Eiger)
*/
Result<bool> getParallelMode(Positions pos = {}) const;
/**
* (Eiger)
*/
void setParallelMode(bool value, Positions pos = {});
/**
* (Eiger)
*/
Result<bool> getOverFlowMode(Positions pos = {}) const;
/**
* (Eiger)
*/
void setOverFlowMode(bool value, Positions pos = {});
/**
* (CTB Options: NORMAL_READOUT = 0, DIGITAL_ONLY = 1, ANALOG_AND_DIGITAL = 2)
*/
Result<int> getSignalType(Positions pos = {}) const;
/**
* (CTB Options: NORMAL_READOUT = 0, DIGITAL_ONLY = 1, ANALOG_AND_DIGITAL = 2)
*/
void setSignalType(int value, Positions pos = {});
// Erik
Result<int> getFramesCaughtByReceiver(Positions pos = {}) const;

6
slsDetectorSoftware/include/multiSlsDetector.h
View File

@ -886,7 +886,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
externalCommunicationMode setExternalCommunicationMode(
externalCommunicationMode pol = GET_EXTERNAL_COMMUNICATION_MODE,
int detPos = -1);
int detPos = -1);//
/**
* Set/get external signal flags (to specify triggerinrising edge etc)
@ -897,7 +897,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
*/
externalSignalFlag
setExternalSignalFlags(externalSignalFlag pol = GET_EXTERNAL_SIGNAL_FLAG,
int detPos = -1);
int detPos = -1);//
/**
* Set/get readout flags (Eiger, Mythen)
@ -906,7 +906,7 @@ class multiSlsDetector : public virtual slsDetectorDefs {
* @param detPos -1 for all detectors in list or specific detector position
* @returns readout flag
*/
int setReadOutFlags(readOutFlags flag = GET_READOUT_FLAGS, int detPos = -1);
int setReadOutFlags(readOutFlags flag = GET_READOUT_FLAGS, int detPos = -1);//
/**
* Set Interrupt last sub frame (Only for Eiger)

2
slsDetectorSoftware/include/multiSlsDetectorClient.h
View File

@ -101,7 +101,7 @@ class multiSlsDetectorClient {
return;
}
}
if (parser.detector_id() >= detPtr->size()) {
if (parser.detector_id() >= static_cast<int>(detPtr->size())) {
os << "position is out of bounds.\n";
return;
}