detectors/slsDetectorPackage
25
0
Fork 0
mirror of https://github.com/slsdetectorgroup/slsDetectorPackage.git synced 2025-04-24 23:30:03 +02:00
Code Issues Actions Packages Releases Activity

changed fd and some unused store

Browse Source
This commit is contained in:
Erik Frojdh 2018-12-19 12:24:02 +01:00
parent 88b9a93b3e
commit 89d9204e1c
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -5079,7 +5079,7 @@ int slsDetector::setFileIndex(int i) {
FILE_LOG(logDEBUG1) << "Receiver file index: " << retval; FILE_LOG(logDEBUG1) << "Receiver file index: " << retval;
thisDetector->receiver_fileIndex = retval; thisDetector->receiver_fileIndex = retval;
if (ret == FORCE_UPDATE) if (ret == FORCE_UPDATE)
ret = updateReceiver(); updateReceiver(); // Do we need to handle this ret?
} }
} }
} }
@ -5154,7 +5154,7 @@ slsDetectorDefs::runStatus slsDetector::getReceiverStatus() {
} else { } else {
FILE_LOG(logDEBUG1) << "Receiver Status: " << runStatusType(retval); FILE_LOG(logDEBUG1) << "Receiver Status: " << runStatusType(retval);
if (ret == FORCE_UPDATE) if (ret == FORCE_UPDATE)
ret = updateReceiver(); updateReceiver(); //Do we need to handle this ret?
} }
} }
return retval; return retval;
@ -5177,7 +5177,7 @@ int slsDetector::getFramesCaughtByReceiver() {
} else { } else {
FILE_LOG(logDEBUG1) << "Frames Caught by Receiver: " << retval; FILE_LOG(logDEBUG1) << "Frames Caught by Receiver: " << retval;
if (ret == FORCE_UPDATE) if (ret == FORCE_UPDATE)
ret = updateReceiver(); updateReceiver(); //Do we need to handle this ret?
} }
} }
return retval; return retval;
@ -5200,7 +5200,7 @@ int slsDetector::getReceiverCurrentFrameIndex() {
} else { } else {
FILE_LOG(logDEBUG1) << "Current Frame Index of Receiver: " << retval; FILE_LOG(logDEBUG1) << "Current Frame Index of Receiver: " << retval;
if (ret == FORCE_UPDATE) if (ret == FORCE_UPDATE)
ret = updateReceiver(); updateReceiver(); //Do we need to handle this ret?
} }
} }
return retval; return retval;
@ -5402,7 +5402,7 @@ int slsDetector::enableTenGigabitEthernet(int i) {
} else { } else {
FILE_LOG(logDEBUG1) << "Receiver 10Gbe enable: " << retval; FILE_LOG(logDEBUG1) << "Receiver 10Gbe enable: " << retval;
if (ret == FORCE_UPDATE) if (ret == FORCE_UPDATE)
ret = updateReceiver(); updateReceiver(); //Do we need to handle this ret?
} }
} }
} }
@ -5427,7 +5427,7 @@ int slsDetector::setReceiverFifoDepth(int i) {
} else { } else {
FILE_LOG(logDEBUG1) << "Receiver Fifo Depth: " << retval; FILE_LOG(logDEBUG1) << "Receiver Fifo Depth: " << retval;
if (ret == FORCE_UPDATE) if (ret == FORCE_UPDATE)
ret = updateReceiver(); updateReceiver(); //Do we need to handle this ret?
} }
} }
return retval; return retval;
@ -5486,7 +5486,7 @@ int slsDetector::setCTBPattern(std::string fname) {
uint64_t word; uint64_t word;
int addr = 0; int addr = 0;
FILE *fd = fopen(fname.c_str(),"r"); FILE *fd = fopen(fname.c_str(),"r");
if (fd > 0) { if (fd != nullptr) {
while (fread(&word, sizeof(word), 1, fd)) { while (fread(&word, sizeof(word), 1, fd)) {
setCTBWord(addr, word); setCTBWord(addr, word);
++addr; ++addr;