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

ctb readout works with receiver for digital readout, allocate ram in server only if 1g udp, free addr info only when setting new udp detals upon configuring ,brough readout flags to receiver

Browse Source
This commit is contained in:
maliakal_d
2019-02-28 16:07:47 +01:00
parent 96584ce397
commit debf3a1b01
14 changed files with 316 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -2245,6 +2245,31 @@ int slsDetector::setReadOutFlags(readOutFlags flag) {
if (ret == FORCE_UPDATE) {
ret = updateDetector();
}
// sending to receiver
if (ret != FAIL) {
fnum = F_RECEIVER_SET_READOUT_FLAGS;
ret = FAIL;
arg = thisDetector->roFlags;
retval = (readOutFlags) -1;
FILE_LOG(logDEBUG1) << "Setting receiver readout flags to " << arg;
if (thisDetector->receiverOnlineFlag == ONLINE_FLAG) {
auto receiver = sls::ClientSocket(true, thisDetector->receiver_hostname, thisDetector->receiverTCPPort);
ret = receiver.sendCommandThenRead(fnum, &arg, sizeof(arg), &retval, sizeof(retval));
// handle ret
if (ret == FAIL) {
setErrorMask((getErrorMask()) | (COULD_NOT_SET_READOUT_FLAGS));
} else {
FILE_LOG(logDEBUG1) << "Receiver readout flag: " << retval;
}
}
if (ret == FORCE_UPDATE) {
ret = updateReceiver();
}
}
return thisDetector->roFlags;
}
@ -2425,15 +2450,17 @@ std::string slsDetector::setReceiver(const std::string &receiverIP) {
setDynamicRange(thisDetector->dynamicRange);
if (thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) {
setTimer(SAMPLES, thisDetector->timerValue[SAMPLES]);
enableTenGigabitEthernet(thisDetector->tenGigaEnable);
}
if (thisDetector->myDetectorType == EIGER) {
setFlippedData(X, -1);
activate(-1);
setDeactivatedRxrPaddingMode(thisDetector->receiver_deactivatedPaddingEnable);
enableTenGigabitEthernet(thisDetector->tenGigaEnable);
enableGapPixels(thisDetector->gappixels);
}
if (thisDetector->myDetectorType == EIGER || thisDetector->myDetectorType == CHIPTESTBOARD || thisDetector->myDetectorType == MOENCH) {
enableTenGigabitEthernet(thisDetector->tenGigaEnable);
setReadOutFlags(thisDetector->roFlags);
}
setReceiverSilentMode(thisDetector->receiver_silentMode);
// data streaming
setReceiverStreamingFrequency(thisDetector->receiver_read_freq);