From e0ea08332f6b0bfad25b940600e9b6bc283e1f54 Mon Sep 17 00:00:00 2001 From: Dhanya Thattil Date: Tue, 26 May 2020 17:44:31 +0200 Subject: [PATCH] gotthard2: fix in rxr for gotthard2 --- slsReceiverSoftware/src/ClientInterface.cpp | 4 ++-- slsReceiverSoftware/src/Implementation.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/slsReceiverSoftware/src/ClientInterface.cpp b/slsReceiverSoftware/src/ClientInterface.cpp index f0d092727..a2cc851ca 100644 --- a/slsReceiverSoftware/src/ClientInterface.cpp +++ b/slsReceiverSoftware/src/ClientInterface.cpp @@ -417,7 +417,7 @@ int ClientInterface::setup_receiver(Interface &socket) { // acquisition parameters impl()->setNumberOfFrames(arg.frames); impl()->setNumberOfTriggers(arg.triggers); - if (myDetectorType == GOTTHARD) { + if (myDetectorType == GOTTHARD2) { impl()->setNumberOfBursts(arg.bursts); } if (myDetectorType == MOENCH || myDetectorType == CHIPTESTBOARD) { @@ -503,7 +503,7 @@ int ClientInterface::setup_receiver(Interface &socket) { int ncounters = __builtin_popcount(arg.countermask); impl()->setNumberofCounters(ncounters); } - if (myDetectorType == GOTTHARD) { + if (myDetectorType == GOTTHARD2) { impl()->setBurstMode(arg.burstType); } diff --git a/slsReceiverSoftware/src/Implementation.cpp b/slsReceiverSoftware/src/Implementation.cpp index 8534471ef..cf8303c64 100644 --- a/slsReceiverSoftware/src/Implementation.cpp +++ b/slsReceiverSoftware/src/Implementation.cpp @@ -101,7 +101,7 @@ void Implementation::InitializeMembers() { numberOfBursts = 1; numberOfAdditionalStorageCells = 0; timingMode = AUTO_TIMING; - burstMode = BURST_OFF; + burstMode = BURST_INTERNAL; acquisitionPeriod = SAMPLE_TIME_IN_NS; acquisitionTime = 0; subExpTime = 0; @@ -1280,7 +1280,7 @@ void Implementation::updateTotalNumberOfFrames() { // burst mode: (bursts instead of triggers) // non burst mode: no bursts or triggers if (myDetectorType == GOTTHARD2 && timingMode == AUTO_TIMING) { - if (burstMode == BURST_OFF) { + if (burstMode != BURST_OFF) { repeats = numberOfBursts; } else { repeats = 1;