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

initial version of gotthard2

Browse Source
This commit is contained in:
maliakal_d
2019-08-26 09:59:27 +02:00
parent 8ec0ac4eb3
commit 386b6601a8
11 changed files with 556 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -78,6 +78,9 @@ void slsDetector::checkDetectorVersionCompatibility() {
case MYTHEN3:
arg = APIMYTHEN3;
break;
case GOTTHARD2:
arg = APIGOTTHARD2;
break;
default:
throw NotImplementedError(
"Check version compatibility is not implemented for this detector");
@ -391,6 +394,9 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
case MYTHEN3:
shm()->rxFramesPerFile = MYTHEN3_MAX_FRAMES_PER_FILE;
break;
case GOTTHARD2:
shm()->rxFramesPerFile = GOTTHARD2_MAX_FRAMES_PER_FILE;
break;
default:
break;
}
@ -779,7 +785,7 @@ void slsDetector::updateCachedDetectorVariables() {
shm()->timerValue[FRAME_PERIOD] = i64;
// delay
if (shm()->myDetectorType != EIGER && shm()->myDetectorType != MYTHEN3 ) {
if (shm()->myDetectorType != EIGER && shm()->myDetectorType != MYTHEN3 && shm()->myDetectorType != GOTTHARD2) {
n += client.Receive(&i64, sizeof(i64));
shm()->timerValue[DELAY_AFTER_TRIGGER] = i64;
}