detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-06-13 13:27: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

41
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -1935,13 +1935,19 @@ 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; break;
case GOTTHARD:
sendROI(-1, nullptr);
break;
default: default:
break; break;
} }
@ -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,22 +2648,22 @@ 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
updateTotalNumberOfChannels();
// send to processor // update #nchans and databytes, as it depends on #samples, adcmask, readoutflags
if (shm()->myDetectorType == MOENCH) updateTotalNumberOfChannels();
setAdditionalJsonParameter("adcmask", std::to_string(shm()->adcEnableMask));
// send to processor
if (shm()->rxOnlineFlag == ONLINE_FLAG) { if (shm()->myDetectorType == MOENCH)
int fnum = F_RECEIVER_SET_ADC_MASK; setAdditionalJsonParameter("adcmask", std::to_string(shm()->adcEnableMask));
int retval = -1;
mask = shm()->adcEnableMask; if (shm()->rxOnlineFlag == ONLINE_FLAG) {
FILE_LOG(logDEBUG1) int fnum = F_RECEIVER_SET_ADC_MASK;
<< "Setting ADC Enable mask to 0x" << std:: hex << mask << std::dec << " in receiver"; int retval = -1;
sendToReceiver(fnum, &mask, sizeof(mask), &retval, sizeof(retval)); mask = shm()->adcEnableMask;
} FILE_LOG(logDEBUG1)
<< "Setting ADC Enable mask to 0x" << std:: hex << mask << std::dec << " in receiver";
sendToReceiver(fnum, &mask, sizeof(mask), &retval, sizeof(retval));
} }
} }