Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DQMServices/Core : gcc 6.0 misleading-indentation warning flags potential bug; with formatting fix ??? #15068

Merged
merged 1 commit into from
Jun 30, 2016
Merged

DQMServices/Core : gcc 6.0 misleading-indentation warning flags potential bug; with formatting fix ??? #15068

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
15 changes: 10 additions & 5 deletions DQMServices/Core/src/DQMNet.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,11 +205,16 @@ DQMNet::unpackQualityData(QReports &qr, uint32_t &flags, const char *from)
while (*qdata)
{
++nqv;
while (*qdata) ++qdata; ++qdata;
while (*qdata) ++qdata; ++qdata;
while (*qdata) ++qdata; ++qdata;
while (*qdata) ++qdata; ++qdata;
while (*qdata) ++qdata; ++qdata;
while (*qdata) ++qdata;
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

?????

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This actually makes sense if you look at DQMNet::packQualityData. But I agree, this requires at least a comment.

++qdata;
while (*qdata) ++qdata;
++qdata;
while (*qdata) ++qdata;
++qdata;
while (*qdata) ++qdata;
++qdata;
while (*qdata) ++qdata;
++qdata;
}

// Now extract the qreports.
Expand Down
6 changes: 3 additions & 3 deletions DQMServices/Core/src/QTest.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -857,7 +857,7 @@ double NoisyChannel::getAverage(int bin, const TH1 *h) const
bin_low = ncx + bin_low;
while (bin_hi > ncx) // shift bin by -ncx
bin_hi = bin_hi - ncx;
sum += h->GetBinContent(bin_low) + h->GetBinContent(bin_hi);
sum += h->GetBinContent(bin_low) + h->GetBinContent(bin_hi);
}
/// average is sum over the # of bins used
return sum/(numNeighbors_ * 2);
Expand Down Expand Up @@ -1216,11 +1216,11 @@ float MeanWithinExpected::runTest(const MonitorElement *me )
return 0;
}
}
else
else {
if (verbose_>0)
std::cout << "QTest:MeanWithinExpected"
<< " Error, neither Range, nor Sigma, nor RMS, exiting\n";
return -1;
return -1; }
}

void MeanWithinExpected::useRange(double xmin, double xmax)
Expand Down