Skip to content

TH1 KolmogorovTest infinite loop #705

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

Merged
lmoneta merged 3 commits into from
Jul 21, 2017
Merged

TH1 KolmogorovTest infinite loop #705

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bba95dd
TH1::KolmogorovTest: Ignore bins with negative content
ashlaban Jun 28, 2017
06024c8
TH1::FillRandom: Refuse filling if source has bins with negative content
ashlaban Jun 28, 2017
fc02c98
clang-format
ashlaban Jun 29, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
clang-format
  • Loading branch information
@ashlaban
ashlaban committed Jul 20, 2017
commit fc02c98be2ac66f136166a7a076aa6c3d30e01c1
16 changes: 9 additions & 7 deletions hist/hist/src/TH1.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3362,8 +3362,9 @@ void TH1::FillRandom(TH1 *h, Int_t ntimes)
if (fDimension != h->GetDimension()) {
Error("FillRandom", "Histograms with different dimensions"); return;
}
if (std::isnan( h->ComputeIntegral(true) )) {
Error("FillRandom", "Histograms contains negative bins, does not represent probabilities"); return;
if (std::isnan(h->ComputeIntegral(true))) {
Error("FillRandom", "Histograms contains negative bins, does not represent probabilities");
return;
}

//in case the target histogram has the same binning and ntimes much greater
Expand Down Expand Up @@ -7485,13 +7486,14 @@ Double_t TH1::KolmogorovTest(const TH1 *h2, Option_t *option) const
const Int_t nEXPT = 1000;
if (opt.Contains("X") && !(afunc1 || afunc2 ) ) {
Double_t dSEXPT;
TH1 *h1_cpy = (TH1*)(gDirectory ? gDirectory->CloneObject(this,kFALSE) : gROOT->CloneObject(this,kFALSE));
TH1 *h1_cpy = (TH1 *)(gDirectory ? gDirectory->CloneObject(this, kFALSE) : gROOT->CloneObject(this, kFALSE));
TH1 *hExpt = (TH1*)(gDirectory ? gDirectory->CloneObject(this,kFALSE) : gROOT->CloneObject(this,kFALSE));

if (h1_cpy->GetMinimum() < 0.0) {
// With negative bins we can't draw random samples in a meaningful way.
Warning("KolmogorovTest", "Detected bins with negative weights, these have been ignored and output might be skewed. Reduce number of bins for histogram?");
while(h1_cpy->GetMinimum() < 0.0) {
// With negative bins we can't draw random samples in a meaningful way.
Warning("KolmogorovTest", "Detected bins with negative weights, these have been ignored and output might be "
"skewed. Reduce number of bins for histogram?");
while (h1_cpy->GetMinimum() < 0.0) {
Int_t idx = h1_cpy->GetMinimumBin();
h1_cpy->SetBinContent(idx, 0.0);
}
Expand All @@ -7501,7 +7503,7 @@ Double_t TH1::KolmogorovTest(const TH1 *h2, Option_t *option) const
prb3 = 0;
for (Int_t i=0; i < nEXPT; i++) {
hExpt->Reset();
hExpt->FillRandom(h1_cpy,(Int_t)esum2);
hExpt->FillRandom(h1_cpy, (Int_t)esum2);
dSEXPT = KolmogorovTest(hExpt,"M");
if (dSEXPT>dfmax) prb3 += 1.0;
}
Expand Down