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

gotthard2: fix in rxr for gotthard2

Browse Source
This commit is contained in:
maliakal_d 2020-05-26 17:44:31 +02:00
parent e229fee6ba
commit e0ea08332f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
slsReceiverSoftware/src/ClientInterface.cpp
View File

@ -417,7 +417,7 @@ int ClientInterface::setup_receiver(Interface &socket) {
// acquisition parameters // acquisition parameters
impl()->setNumberOfFrames(arg.frames); impl()->setNumberOfFrames(arg.frames);
impl()->setNumberOfTriggers(arg.triggers); impl()->setNumberOfTriggers(arg.triggers);
if (myDetectorType == GOTTHARD) { if (myDetectorType == GOTTHARD2) {
impl()->setNumberOfBursts(arg.bursts); impl()->setNumberOfBursts(arg.bursts);
} }
if (myDetectorType == MOENCH || myDetectorType == CHIPTESTBOARD) { if (myDetectorType == MOENCH || myDetectorType == CHIPTESTBOARD) {
@ -503,7 +503,7 @@ int ClientInterface::setup_receiver(Interface &socket) {
int ncounters = __builtin_popcount(arg.countermask); int ncounters = __builtin_popcount(arg.countermask);
impl()->setNumberofCounters(ncounters); impl()->setNumberofCounters(ncounters);
} }
if (myDetectorType == GOTTHARD) { if (myDetectorType == GOTTHARD2) {
impl()->setBurstMode(arg.burstType); impl()->setBurstMode(arg.burstType);
} }

4
slsReceiverSoftware/src/Implementation.cpp
View File

@ -101,7 +101,7 @@ void Implementation::InitializeMembers() {
numberOfBursts = 1; numberOfBursts = 1;
numberOfAdditionalStorageCells = 0; numberOfAdditionalStorageCells = 0;
timingMode = AUTO_TIMING; timingMode = AUTO_TIMING;
burstMode = BURST_OFF; burstMode = BURST_INTERNAL;
acquisitionPeriod = SAMPLE_TIME_IN_NS; acquisitionPeriod = SAMPLE_TIME_IN_NS;
acquisitionTime = 0; acquisitionTime = 0;
subExpTime = 0; subExpTime = 0;
@ -1280,7 +1280,7 @@ void Implementation::updateTotalNumberOfFrames() {
// burst mode: (bursts instead of triggers) // burst mode: (bursts instead of triggers)
// non burst mode: no bursts or triggers // non burst mode: no bursts or triggers
if (myDetectorType == GOTTHARD2 && timingMode == AUTO_TIMING) { if (myDetectorType == GOTTHARD2 && timingMode == AUTO_TIMING) {
if (burstMode == BURST_OFF) { if (burstMode != BURST_OFF) {
repeats = numberOfBursts; repeats = numberOfBursts;
} else { } else {
repeats = 1; repeats = 1;