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

minor

Browse Source
This commit is contained in:
Erik Frojdh 2018-05-25 17:09:23 +02:00
parent 05ed8dca4e
commit 4765849613
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5280,10 +5280,8 @@ slsDetectorDefs::runStatus multiSlsDetector::getReceiverStatus()
int multiSlsDetector::getFramesCaughtByAnyReceiver() int multiSlsDetector::getFramesCaughtByAnyReceiver()
{ {
int ret = 0; int ret = 0;
int i = thisMultiDetector->masterPosition; int i = thisMultiDetector->masterPosition;
if (i >= 0) { if (i >= 0) {
if (detectors[i]) { if (detectors[i]) {
ret = detectors[i]->getFramesCaughtByReceiver(); ret = detectors[i]->getFramesCaughtByReceiver();
@ -5293,7 +5291,6 @@ int multiSlsDetector::getFramesCaughtByAnyReceiver()
return ret; return ret;
} }
} }
for (int i = 0; i < thisMultiDetector->numberOfDetectors; ++i) for (int i = 0; i < thisMultiDetector->numberOfDetectors; ++i)
if (detectors[i]) { if (detectors[i]) {
ret = detectors[i]->getFramesCaughtByReceiver(); ret = detectors[i]->getFramesCaughtByReceiver();
@ -5870,11 +5867,9 @@ int multiSlsDetector::setReceiverReadTimer(int time_in_ms)
int multiSlsDetector::enableDataStreamingToClient(int enable) int multiSlsDetector::enableDataStreamingToClient(int enable)
{ {
if (enable >= 0) { if (enable >= 0) {
//destroy data threads //destroy data threads
if (!enable) if (!enable)
createReceivingDataSockets(true); createReceivingDataSockets(true);
//create data threads //create data threads
else { else {
if (createReceivingDataSockets() == FAIL) { if (createReceivingDataSockets() == FAIL) {
@ -5922,11 +5917,8 @@ int multiSlsDetector::setReceiverSilentMode(int i)
*/ */
int multiSlsDetector::setCTBPattern(string fname) int multiSlsDetector::setCTBPattern(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 > 0) {
while (fread(&word, sizeof(word), 1, fd)) { while (fread(&word, sizeof(word), 1, fd)) {