Merge branch 'cms-analysis:main' into main

cms-analysis · Jun 19, 2024 · 4c871e3 · 4c871e3
2 parents 132ff6c + d873b3b
commit 4c871e3
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/.github/workflows/cvmfs-ci.yml b/.github/workflows/cvmfs-ci.yml
@@ -56,6 +56,9 @@ jobs:
             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
             combine datacard-5-multi-signal.root -M MultiDimFit --algo singles --mass 125
             combine HiggsAnalysis/CombinedLimit/data/tutorials/CAT23001/datacard-5-multi-signal.txt -M ChannelCompatibilityCheck --mass 125
+            text2workspace.py  HiggsAnalysis/CombinedLimit/data/tutorials/multiDim/toy-hgg-125.txt -m 125 -P HiggsAnalysis.CombinedLimit.PhysicsModel:floatingXSHiggs --PO modes=ggH,qqH
+            combine -M MultiDimFit HiggsAnalysis/CombinedLimit/data/tutorials/multiDim/toy-hgg-125.root
+
 
 
 
diff --git a/bin/combine.cpp b/bin/combine.cpp
@@ -32,7 +32,7 @@
 using namespace std;
 
 // Update whenever we have a new Tag
-std::string combineTagString = "v10.0.0";
+std::string combineTagString = "v10.0.1";
 // 
 
 int main(int argc, char **argv) {

diff --git a/docs/index.md b/docs/index.md
@@ -46,12 +46,12 @@ cmsenv
 git clone https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git HiggsAnalysis/CombinedLimit
 cd HiggsAnalysis/CombinedLimit
 ```
-Update to a recommended tag - currently the recommended tag is **v10.0.0**: [see release notes](https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit/releases/tag/v10.0.0)
+Update to a recommended tag - currently the recommended tag is **v10.0.1**: [see release notes](https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit/releases/tag/v10.0.1)
 
 ```sh
 cd $CMSSW_BASE/src/HiggsAnalysis/CombinedLimit
 git fetch origin
-git checkout v10.0.0
+git checkout v10.0.1
 scramv1 b clean; scramv1 b # always make a clean build
 ```
 

diff --git a/src/utils.cc b/src/utils.cc
@@ -892,11 +892,18 @@ void utils::check_inf_parameters(const RooArgSet & params, int verbosity) {
     for (RooAbsArg *arg : params) {    
         RooRealVar *p = dynamic_cast<RooRealVar *>(arg);
         if (p->getRange().first <= -infinity_root626 || p->getRange().second >= +infinity_root626){
+
             if ( verbosity > 2 ) {
                 std::cout << "Found a parameter named "<< p->GetName()
-                          << " infinite in ROOT versions < 6.30, going to removeRange()" << endl;
+                          << " 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;
+            }
+            if (p->getRange().first <= -infinity_root626 && p->getRange().second >= +infinity_root626) {
+              p->removeRange();
+            } else if (p->getRange().second >= +infinity_root626) {
+              p->removeMax();
+            } else {
+              p->removeMin();
             }
-            p->removeRange();
         }
     }
 }