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

review fdback: using sendtoReceiver, not using size of for specifyng arguments to sendtodetector

Browse Source
This commit is contained in:
maliakal_d 2019-05-06 19:13:31 +02:00
parent 0904d1db29
commit 932e377765
1 changed files with 5 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
slsDetectorSoftware/src/slsDetector.cpp
View File

@ -2681,7 +2681,7 @@ void slsDetector::setADCInvert(uint32_t value) {
uint32_t arg = value; uint32_t arg = value;
FILE_LOG(logDEBUG1) << "Setting ADC Invert to 0x" << std::hex << arg << std::dec; FILE_LOG(logDEBUG1) << "Setting ADC Invert to 0x" << std::hex << arg << std::dec;
if (shm()->onlineFlag == ONLINE_FLAG) { if (shm()->onlineFlag == ONLINE_FLAG) {
sendToDetector(F_SET_ADC_INVERT, &arg, sizeof(arg), nullptr, 0); sendToDetector(F_SET_ADC_INVERT, &arg, nullptr);
} }
} }
@ -2741,25 +2741,11 @@ void slsDetector::setReceiverDbitList(std::vector<int> list) {
shm()->rxDbitListSize = list.size(); shm()->rxDbitListSize = list.size();
std::copy(list.begin(), list.end(), shm()->rxDbitList); std::copy(list.begin(), list.end(), shm()->rxDbitList);
int ret = FAIL;
if (shm()->rxOnlineFlag == ONLINE_FLAG) { if (shm()->rxOnlineFlag == ONLINE_FLAG) {
int fnum = F_SET_RECEIVER_DBIT_LIST; int args[list.size() + 1];
int arg = list.size(); args[0] = list.size();
auto receiver = std::copy(std::begin(list), std::end(list), args + 1);
sls::ClientSocket("Receiver", shm()->rxHostname, shm()->rxTCPPort); sendToReceiver(F_SET_RECEIVER_DBIT_LIST, args, sizeof(args), nullptr, 0);
receiver.sendData(&fnum, sizeof(fnum));
receiver.sendData(&arg, sizeof(arg));
receiver.sendData(shm()->rxDbitList, arg * sizeof(int));
receiver.receiveData(&ret, sizeof(ret));
if (ret == FAIL) {
char mess[MAX_STR_LENGTH]{};
receiver.receiveData(mess, MAX_STR_LENGTH);
throw ReceiverError("Receiver " + std::to_string(detId) +
" returned error: " + std::string(mess));
}
}
if (ret == FORCE_UPDATE) {
ret = updateCachedReceiverVariables();
} }
} }