Skip to content

Commit 02eaddc

Browse files
authored
Merge pull request #974 from cms-analysis/inf_par_fix
Fix a bug check_inf_parameters
2 parents 0731178 + 03067d8 commit 02eaddc

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

.github/workflows/cvmfs-ci.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,9 @@ jobs:
5656
text2workspace.py HiggsAnalysis/CombinedLimit/data/tutorials/CAT23001/datacard-5-multi-signal.txt -P HiggsAnalysis.CombinedLimit.PhysicsModel:floatingXSHiggs --PO modes=ggH,qqH -o datacard-5-multi-signal.root --mass 125
5757
combine datacard-5-multi-signal.root -M MultiDimFit --algo singles --mass 125
5858
combine HiggsAnalysis/CombinedLimit/data/tutorials/CAT23001/datacard-5-multi-signal.txt -M ChannelCompatibilityCheck --mass 125
59+
text2workspace.py HiggsAnalysis/CombinedLimit/data/tutorials/multiDim/toy-hgg-125.txt -m 125 -P HiggsAnalysis.CombinedLimit.PhysicsModel:floatingXSHiggs --PO modes=ggH,qqH
60+
combine -M MultiDimFit HiggsAnalysis/CombinedLimit/data/tutorials/multiDim/toy-hgg-125.root
61+
5962
6063
6164

src/utils.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -892,11 +892,18 @@ void utils::check_inf_parameters(const RooArgSet & params, int verbosity) {
892892
for (RooAbsArg *arg : params) {
893893
RooRealVar *p = dynamic_cast<RooRealVar *>(arg);
894894
if (p->getRange().first <= -infinity_root626 || p->getRange().second >= +infinity_root626){
895+
895896
if ( verbosity > 2 ) {
896897
std::cout << "Found a parameter named "<< p->GetName()
897-
<< " infinite in ROOT versions < 6.30, going to removeRange()" << endl;
898+
<< " infinite in ROOT versions < 6.30, going to update the ranges to take into account the new definition of infinity in ROOT v6.30" << endl;
899+
}
900+
if (p->getRange().first <= -infinity_root626 && p->getRange().second >= +infinity_root626) {
901+
p->removeRange();
902+
} else if (p->getRange().second >= +infinity_root626) {
903+
p->removeMax();
904+
} else {
905+
p->removeMin();
898906
}
899-
p->removeRange();
900907
}
901908
}
902909
}

0 commit comments

Comments
 (0)