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

range based loops and bool literals

Browse Source
This commit is contained in:
Erik Frojdh
2019-01-10 16:07:47 +01:00
parent 15235ab4fc
commit 37c22dfeb2
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -370,8 +370,8 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
strncpy(thisDetector->settingsDir, getenv("HOME"), MAX_STR_LENGTH-1); strncpy(thisDetector->settingsDir, getenv("HOME"), MAX_STR_LENGTH-1);
thisDetector->settingsDir[MAX_STR_LENGTH-1] = 0; thisDetector->settingsDir[MAX_STR_LENGTH-1] = 0;
thisDetector->nTrimEn = 0; thisDetector->nTrimEn = 0;
for(int i = 0; i < MAX_TRIMEN; ++i) for(int & trimEnergie : thisDetector->trimEnergies)
thisDetector->trimEnergies[i] = 0; trimEnergie = 0;
// thisDetector->threadedProcessing = 1; // thisDetector->threadedProcessing = 1;
thisDetector->nROI = 0; thisDetector->nROI = 0;
memset(thisDetector->roiLimits, 0, MAX_ROIS * sizeof(ROI)); memset(thisDetector->roiLimits, 0, MAX_ROIS * sizeof(ROI));
@ -423,7 +423,7 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
thisDetector->detectorStopAPIVersion = 0; thisDetector->detectorStopAPIVersion = 0;
thisDetector->receiverAPIVersion = 0; thisDetector->receiverAPIVersion = 0;
thisDetector->receiver_frameDiscardMode = NO_DISCARD; thisDetector->receiver_frameDiscardMode = NO_DISCARD;
thisDetector->receiver_framePadding = 1; thisDetector->receiver_framePadding = true;
thisDetector->activated = true; thisDetector->activated = true;
thisDetector->receiver_deactivatedPaddingEnable = true; thisDetector->receiver_deactivatedPaddingEnable = true;
thisDetector->receiver_silentMode = false; thisDetector->receiver_silentMode = false;
@ -447,8 +447,8 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
default: default:
break; break;
} }
thisDetector->receiver_fileWriteEnable = 1; thisDetector->receiver_fileWriteEnable = true;
thisDetector->receiver_overWriteEnable = 1; thisDetector->receiver_overWriteEnable = true;
// get the detector parameters based on type // get the detector parameters based on type
detParameterList detlist; detParameterList detlist;
@ -1490,10 +1490,10 @@ int slsDetector::writeConfigurationFile(std::ofstream &outfile, multiSlsDetector
} }
auto cmd = slsDetectorCommand(m); auto cmd = slsDetectorCommand(m);
for (unsigned int iline = 0; iline < names.size(); ++iline) { for (auto & name : names) {
char* args[] = {(char*)names[iline].c_str()}; char* args[] = {(char*)name.c_str()};
outfile << detId << ":"; outfile << detId << ":";
outfile << names[iline] << " " << cmd.executeLine(1, args, GET_ACTION) << std::endl; outfile << name << " " << cmd.executeLine(1, args, GET_ACTION) << std::endl;
} }
return OK; return OK;
} }