Merge branch '3.0.1' into developer

This commit is contained in:
Dhanya Maliakal 2017-12-05 13:47:09 +01:00
commit 2d14da545d

View File

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