removed all the warnings and errors from the merge, also removed added -wextra compiler flag, (yet to add additional commands for moench)

This commit is contained in:
2019-02-12 11:09:19 +01:00
parent a64b34610a
commit 031a11c4f7
6 changed files with 9 additions and 11 deletions

View File

@ -2123,7 +2123,7 @@ int multiSlsDetector::setROI(int n, ROI roiLimits[], int detPos) {
ymin = roiLimits[i].ymin;
ymax = roiLimits[i].ymax;
if (getDetectorsType() != JUNGFRAUCTB || getNumberOfDetectors() > 1) {
if (getNumberOfDetectors() > 1) {
// check roi max values
idet = decodeNChannel(xmax, ymax, channelX, channelY);
FILE_LOG(logDEBUG1) << "Decoded Channel max vals: " << std::endl