From da6b919d3cd012daba05f7390edf6c005f97a6ca Mon Sep 17 00:00:00 2001 From: Aliya Nigamova Date: Mon, 17 Jun 2024 14:07:40 +0200 Subject: [PATCH 1/4] fix check_inf_parameters which is atm bugged for counting experiments --- .github/workflows/cvmfs-ci.yml | 3 +++ src/utils.cc | 11 +++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cvmfs-ci.yml b/.github/workflows/cvmfs-ci.yml index 15021e1dc2f..6ddbaef9fb0 100644 --- 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 toy-hgg-125.txt -m 125 -P HiggsAnalysis.CombinedLimit.PhysicsModel:floatingXSHiggs --PO modes=ggH,qqH + combine -M MultiDimFit toy-hgg-125.root + diff --git a/src/utils.cc b/src/utils.cc index 95adf0bd321..b716edda8c6 100644 --- 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(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(); } } } From db777c6770f732d3961e045707568337ca58810e Mon Sep 17 00:00:00 2001 From: Aliya Nigamova Date: Mon, 17 Jun 2024 14:12:27 +0200 Subject: [PATCH 2/4] fixing paths --- .github/workflows/cvmfs-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cvmfs-ci.yml b/.github/workflows/cvmfs-ci.yml index 6ddbaef9fb0..a23fd525a88 100644 --- a/.github/workflows/cvmfs-ci.yml +++ b/.github/workflows/cvmfs-ci.yml @@ -56,8 +56,8 @@ 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 toy-hgg-125.txt -m 125 -P HiggsAnalysis.CombinedLimit.PhysicsModel:floatingXSHiggs --PO modes=ggH,qqH - combine -M MultiDimFit toy-hgg-125.root + text2workspace.py data/tutorials/multiDim/toy-hgg-125.txt -m 125 -P HiggsAnalysis.CombinedLimit.PhysicsModel:floatingXSHiggs --PO modes=ggH,qqH + combine -M MultiDimFit data/tutorials/multiDim/toy-hgg-125.root From 03067d89ed3f10df5e83ad289ab6fb72ff2cdbfe Mon Sep 17 00:00:00 2001 From: Aliya Nigamova Date: Mon, 17 Jun 2024 14:20:43 +0200 Subject: [PATCH 3/4] really fixing paths --- .github/workflows/cvmfs-ci.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/cvmfs-ci.yml b/.github/workflows/cvmfs-ci.yml index a23fd525a88..ce62e0abdc3 100644 --- a/.github/workflows/cvmfs-ci.yml +++ b/.github/workflows/cvmfs-ci.yml @@ -56,8 +56,8 @@ 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 data/tutorials/multiDim/toy-hgg-125.txt -m 125 -P HiggsAnalysis.CombinedLimit.PhysicsModel:floatingXSHiggs --PO modes=ggH,qqH - combine -M MultiDimFit data/tutorials/multiDim/toy-hgg-125.root + 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 From 37a8aa0374d4db44fcef4be47a468aefea37c881 Mon Sep 17 00:00:00 2001 From: Aliya Nigamova Date: Wed, 19 Jun 2024 11:25:10 +0200 Subject: [PATCH 4/4] update the version to v10.0.1 --- bin/combine.cpp | 2 +- docs/index.md | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/bin/combine.cpp b/bin/combine.cpp index 850a419d484..592b0b04849 100644 --- 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 index c5c12d30a01..f4f3110ae68 100644 --- 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 ```