detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-22 17:47:59 +02:00
Code Issues Actions Packages Releases Activity

slsDetectorSoftware: from 3.1.4: being able to get timer values individually from the users class since gotthard 25um master and slave will have different delay values

Browse Source
This commit is contained in:
maliakal_d
2018-07-30 17:47:37 +02:00
parent 73fcef5f6d
commit 41fb6c26a2
9 changed files with 87 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -2567,8 +2567,22 @@ int multiSlsDetector::configureMAC() {
return callDetectorMember(&slsDetector::configureMAC);
}
int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t) {
int64_t ret = parallelCallDetectorMember(&slsDetector::setTimer, index, t);
int64_t multiSlsDetector::setTimer(timerIndex index, int64_t t, int imod) {
int64_t ret=-100;
// single (for gotthard 25 um)
if (imod != -1) {
if (imod >= 0 && imod < (int)detectors.size()) {
ret = detectors[imod]->setTimer(index,t,imod);
if(detectors[imod]->getErrorMask())
setErrorMask(getErrorMask()|(1<<imod));
return ret;
}
return -1;
}
// multi
ret = parallelCallDetectorMember(&slsDetector::setTimer, index, t);
if (index == SAMPLES_JCTB)
setDynamicRange();

3
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.h
View File

@ -1033,9 +1033,10 @@ public:
* Set/get timer value (not all implemented for all detectors)
* @param index timer index
* @param t time in ns or number of...(e.g. frames, gates, probes)
* @param imod module number (gotthard delay can have different values)
* @returns timer set value in ns or number of...(e.g. frames, gates, probes)
*/
int64_t setTimer(timerIndex index, int64_t t=-1);
int64_t setTimer(timerIndex index, int64_t t=-1, int imod = -1);
/**
* Set/get timer value left in acquisition (not all implemented for all detectors)