detectors/slsDetectorPackage
24
1
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2026-02-01 13:14:56 +01:00
Code Issues Actions Packages Releases Activity

rearranging

Browse Source
This commit is contained in:
maliakal_d
2020-01-15 15:08:01 +01:00
parent de53747ddd
commit b6d9015ed0
6 changed files with 73 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
slsDetectorSoftware/src/slsDetector.cpp
View File

@@ -1483,6 +1483,16 @@ int64_t slsDetector::getMeasurementTime() const {
return retval;
}
slsDetectorDefs::timingMode slsDetector::setTimingMode(timingMode pol) {
int fnum = F_SET_TIMING_MODE;
auto arg = static_cast<int>(pol);
timingMode retval = GET_TIMING_MODE;
FILE_LOG(logDEBUG1) << "Setting communication to mode " << pol;
sendToDetector(fnum, arg, retval);
FILE_LOG(logDEBUG1) << "Timing Mode: " << retval;
return retval;
}
int slsDetector::setDynamicRange(int n) {
// TODO! Properly handle fail
int prevDr = shm()->dynamicRange;
@@ -1549,16 +1559,6 @@ int slsDetector::getADC(dacIndex index) {
return retval;
}
slsDetectorDefs::timingMode slsDetector::setTimingMode(timingMode pol) {
int fnum = F_SET_TIMING_MODE;
auto arg = static_cast<int>(pol);
timingMode retval = GET_TIMING_MODE;
FILE_LOG(logDEBUG1) << "Setting communication to mode " << pol;
sendToDetector(fnum, arg, retval);
FILE_LOG(logDEBUG1) << "Timing Mode: " << retval;
return retval;
}
slsDetectorDefs::externalSignalFlag
slsDetector::setExternalSignalFlags(externalSignalFlag pol) {
int fnum = F_SET_EXTERNAL_SIGNAL_FLAG;