Merge branch '3.0.1' into developer

This commit is contained in:
Dhanya Maliakal 2017-11-22 17:06:51 +01:00
commit fb3c903c04

View File

@ -3702,13 +3702,15 @@ string multiSlsDetector::getNetworkParameter(networkParameter p) {
setErrorMask(getErrorMask()|(1<<idet));
if (s0=="")
s0=s;
s0=s+string("+");
else
s0+=string("+")+s;
s0+=s+string("+");
if (s1=="")
s1=s;
else if (s1!=s)
s1="bad";
}
}
if (s1=="bad")