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

slsDetectorSoftware: removed warnings, and made compilable via make

Browse Source
This commit is contained in:
maliakal_d
2018-07-10 14:58:18 +02:00
parent f5a86bbfe1
commit c2b1eef75c
10 changed files with 161 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
slsDetectorSoftware/slsDetector/slsDetector.cpp
View File

@ -646,7 +646,8 @@ void slsDetector::initializeDetectorStructure(detectorType type) {
strncpy(thisDetector->calDir, getenv("HOME"), MAX_STR_LENGTH-1);
thisDetector->calDir[MAX_STR_LENGTH-1] = 0;
thisDetector->nTrimEn = 0;
thisDetector->trimEnergies[100];
for(int i = 0; i < MAX_TRIMEN; ++i)
thisDetector->trimEnergies[i] = 0;
thisDetector->progressIndex = 0;
thisDetector->totalProgress = 1;
strcpy(thisDetector->filePath, "/");
@ -876,6 +877,8 @@ void slsDetector::initializeMembers() {
case JUNGFRAUCTB:
fileIO::setFramesPerFile(JFRAU_MAX_FRAMES_PER_FILE);
break;
default:
break;
}