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

Merge branch '3.0.1' into developer

Browse Source
This commit is contained in:
Dhanya Maliakal
2017-12-05 13:47:09 +01:00
parent 9150556209 ce1ec97571
commit 2d14da545d
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
slsDetectorSoftware/multiSlsDetector/multiSlsDetector.cpp
View File

@ -5028,6 +5028,7 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) { for (int i=0; i<thisMultiDetector->numberOfDetectors; ++i) {
// sprintf(ext,".det%d",i); // sprintf(ext,".det%d",i);
if (detectors[i]) { if (detectors[i]) {
outfile << endl;
ret1 = detectors[i]->writeConfigurationFile(outfile,i); ret1 = detectors[i]->writeConfigurationFile(outfile,i);
if(detectors[i]->getErrorMask()) if(detectors[i]->getErrorMask())
setErrorMask(getErrorMask()|(1<<i)); setErrorMask(getErrorMask()|(1<<i));
@ -5036,7 +5037,7 @@ int multiSlsDetector::writeConfigurationFile(string const fname){
} }
} }
outfile << endl;
//other configurations //other configurations
while (iline < nvar) { while (iline < nvar) {
cout << iline << " " << names[iline] << endl; cout << iline << " " << names[iline] << endl;