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

client: finishing up of gotthard for roi and ctb and moench for setting adcenablemask

Browse Source
This commit is contained in:
maliakal_d
2019-04-29 09:10:17 +02:00
parent c0f06fcfca
commit 06d4c7ce37
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -1935,11 +1935,17 @@ std::string slsDetector::setReceiverHostname(const std::string &receiverIP) {
setTimer(SAMPLES, shm()->timerValue[SAMPLES]); setTimer(SAMPLES, shm()->timerValue[SAMPLES]);
enableTenGigabitEthernet(shm()->tenGigaEnable); enableTenGigabitEthernet(shm()->tenGigaEnable);
setReadOutFlags(GET_READOUT_FLAGS); setReadOutFlags(GET_READOUT_FLAGS);
setADCEnableMask(shm()->adcEnableMask);
break; break;
case MOENCH: case MOENCH:
setTimer(SAMPLES, shm()->timerValue[SAMPLES]); setTimer(SAMPLES, shm()->timerValue[SAMPLES]);
enableTenGigabitEthernet(shm()->tenGigaEnable); enableTenGigabitEthernet(shm()->tenGigaEnable);
setADCEnableMask(shm()->adcEnableMask);
break;
case GOTTHARD:
sendROI(-1, nullptr);
break; break;
default: default:
@ -1954,11 +1960,6 @@ std::string slsDetector::setReceiverHostname(const std::string &receiverIP) {
setAdditionalJsonHeader(shm()->rxAdditionalJsonHeader); setAdditionalJsonHeader(shm()->rxAdditionalJsonHeader);
enableDataStreamingFromReceiver( enableDataStreamingFromReceiver(
static_cast<int>(enableDataStreamingFromReceiver(-1))); static_cast<int>(enableDataStreamingFromReceiver(-1)));
if (shm()->myDetectorType == GOTTHARD ||
shm()->myDetectorType == CHIPTESTBOARD ||
shm()->myDetectorType == MOENCH) {
sendROI(-1, nullptr);
}
} }
} }
return std::string(shm()->rxHostname); return std::string(shm()->rxHostname);
@ -2647,6 +2648,7 @@ void slsDetector::setADCEnableMask(uint32_t mask) {
if (shm()->onlineFlag == ONLINE_FLAG) { if (shm()->onlineFlag == ONLINE_FLAG) {
sendToDetector(F_SET_ADC_ENABLE_MASK, &arg, sizeof(arg), nullptr, 0); sendToDetector(F_SET_ADC_ENABLE_MASK, &arg, sizeof(arg), nullptr, 0);
shm()->adcEnableMask = mask; shm()->adcEnableMask = mask;
}
// update #nchans and databytes, as it depends on #samples, adcmask, readoutflags // update #nchans and databytes, as it depends on #samples, adcmask, readoutflags
updateTotalNumberOfChannels(); updateTotalNumberOfChannels();
@ -2664,7 +2666,6 @@ void slsDetector::setADCEnableMask(uint32_t mask) {
sendToReceiver(fnum, &mask, sizeof(mask), &retval, sizeof(retval)); sendToReceiver(fnum, &mask, sizeof(mask), &retval, sizeof(retval));
} }
} }
}
uint32_t slsDetector::getADCEnableMask() { uint32_t slsDetector::getADCEnableMask() {
uint32_t retval = -1; uint32_t retval = -1;