mirror of
https://github.com/slsdetectorgroup/slsDetectorPackage.git
synced 2025-04-26 00:00:02 +02:00
Merge branch '3.0.1' into developer
This commit is contained in:
commit
2d14da545d
@ -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;
|
||||
|
Loading…
x
Reference in New Issue
Block a user