Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion bin/combine.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
using namespace std;

// Update whenever we have a new Tag
std::string combineTagString = "v10.3.3";
std::string combineTagString = "v10.4.1";
//

int main(int argc, char **argv) {
Expand Down
6 changes: 3 additions & 3 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ releases on github under
The nominal installation method is inside CMSSW. The current release targets
the CMSSW `14_1_X` series because of the recent switch to el9 at lxplus machines.

Currently, the recommended tag is **v10.3.3**: [see release notes](https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit/releases/tag/v10.3.3)
Currently, the recommended tag is **v10.4.1**: [see release notes](https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit/releases/tag/v10.4.1)
The `git clone` command below contains this tag and is optimised to reduce disk usage.

```sh
cmsrel CMSSW_14_1_0_pre4
cd CMSSW_14_1_0_pre4/src
cmsenv
git -c advice.detachedHead=false clone --depth 1 --branch v10.3.3 https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git HiggsAnalysis/CombinedLimit
git -c advice.detachedHead=false clone --depth 1 --branch v10.4.1 https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git HiggsAnalysis/CombinedLimit
cd HiggsAnalysis/CombinedLimit
scramv1 b clean; scramv1 b -j$(nproc --ignore=2) # always make a clean build, with n - 2 cores on the system
```
Expand Down Expand Up @@ -226,7 +226,7 @@ Pre-compiled versions of the tool are available as container images from the [CM
```sh
docker run --name combine -it gitlab-registry.cern.ch/cms-cloud/combine-standalone:<tag>
```
where you must replace `<tag>` with a particular version of the tool. Containers are available from `v9.2.1` and `v10.0.1` onwards. If no tag is specified the latest version of the container will be loaded, which is `v10.3.3` at the moment.
where you must replace `<tag>` with a particular version of the tool. Containers are available from `v9.2.1` and `v10.0.1` onwards. If no tag is specified the latest version of the container will be loaded, which is `v10.4.1` at the moment.

You will now have the compiled <span style="font-variant:small-caps;">Combine</span> binary available as well as the complete package of tool.
The container can be re-started using `docker start -i combine`.
Expand Down
2 changes: 1 addition & 1 deletion test/references/LHC-limits.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> using the Profile Likelihood test statistic modified for upper limits (Q_LHC)
>>> Method used is HybridNew
Expand Down
2 changes: 1 addition & 1 deletion test/references/LHC-significance.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> using the Profile Likelihood test statistic modified for upper limits (Q_LHC)
>>> Method used is HybridNew
Expand Down
2 changes: 1 addition & 1 deletion test/references/MarkovChainMC.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MarkovChainMC

Expand Down
2 changes: 1 addition & 1 deletion test/references/cmshistfunc.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Set Range of Parameter r To : (-5,5)
Expand Down
2 changes: 1 addition & 1 deletion test/references/cmshistfunc_channel_masks.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Set Range of Parameter r To : (-5,5)
Expand Down
2 changes: 1 addition & 1 deletion test/references/cmshistfunc_shapeN.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Set Range of Parameter r To : (-5,5)
Expand Down
2 changes: 1 addition & 1 deletion test/references/cmshistsum.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Set Range of Parameter r To : (-5,5)
Expand Down
2 changes: 1 addition & 1 deletion test/references/cmshistsum_channel_masks.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Set Range of Parameter r To : (-5,5)
Expand Down
2 changes: 1 addition & 1 deletion test/references/cmshistsum_shapeN.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Set Range of Parameter r To : (-5,5)
Expand Down
2 changes: 1 addition & 1 deletion test/references/counting_datacard.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Warning: Did not find a parameter with name r
Expand Down
8 changes: 4 additions & 4 deletions test/references/counting_datacard_from_csv.out
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Argument --algo not specified but --fromfile is set to fixed.csv, defaulting to --algo fixed.
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Doing initial fit:
Expand All @@ -9,7 +9,7 @@ Set Default Value of Parameter r_qqH To : 1
Evaluating fixed point with r_ggH= 1
Evaluating fixed point with r_qqH= 1
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Doing initial fit:
Expand All @@ -18,7 +18,7 @@ Set Default Value of Parameter r_qqH To : 2
Evaluating fixed point with r_ggH= 1
Evaluating fixed point with r_qqH= 2
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Doing initial fit:
Expand All @@ -27,7 +27,7 @@ Set Default Value of Parameter r_qqH To : 1
Evaluating fixed point with r_ggH= 2
Evaluating fixed point with r_qqH= 1
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Doing initial fit:
Expand Down
2 changes: 1 addition & 1 deletion test/references/hzz4l-significance.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is Significance

Expand Down
2 changes: 1 addition & 1 deletion test/references/multi-signal-ChannelCompatibilityCheck.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is ChannelCompatibilityCheck

Expand Down
2 changes: 1 addition & 1 deletion test/references/multi-signal.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Doing initial fit:
Expand Down
2 changes: 1 addition & 1 deletion test/references/parametric-analysis-significance.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is Significance

Expand Down
2 changes: 1 addition & 1 deletion test/references/parametric_analysis.out
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Set Range of Parameter r To : (-2,1)
Expand Down
30 changes: 15 additions & 15 deletions test/references/test_interference_py.out
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ Will scale ch1/VBFHH using CMSInterferenceFunc dependent on parameters ["expr::a
Will scale ch1/background by 1
Injecting external morph for prop_binch1_processVBFHH_externalMorph
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is GenerateOnly
Generate toy 1/10
Expand All @@ -245,12 +245,12 @@ Generate toy 7/10
Generate toy 8/10
Generate toy 9/10
Generate toy 10/10
mean expected limit: r < 6.95253e-310 +/- 0 @ 95%CL (10 toyMC)
median expected limit: r < 6.95253e-310 @ 95%CL (10 toyMC)
68% expected band : 6.95253e-310 < r < 6.95253e-310
95% expected band : 6.95253e-310 < r < 6.95253e-310
mean expected limit: r < 6.95286e-310 +/- 0 @ 95%CL (10 toyMC)
median expected limit: r < 6.95286e-310 @ 95%CL (10 toyMC)
68% expected band : 6.95286e-310 < r < 6.95286e-310
95% expected band : 6.95286e-310 < r < 6.95286e-310
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Doing initial fit:
Expand Down Expand Up @@ -333,12 +333,12 @@ best fit parameter values:
kl : +1.283
kv : +0.565
k2v : +0.200
mean expected limit: r < 6.95262e-310 +/- 0 @ 95%CL (10 toyMC)
median expected limit: r < 6.95262e-310 @ 95%CL (10 toyMC)
68% expected band : 6.95262e-310 < r < 6.95262e-310
95% expected band : 6.95262e-310 < r < 6.95262e-310
mean expected limit: r < 6.9528e-310 +/- 0 @ 95%CL (10 toyMC)
median expected limit: r < 6.9528e-310 @ 95%CL (10 toyMC)
68% expected band : 6.9528e-310 < r < 6.9528e-310
95% expected band : 6.9528e-310 < r < 6.9528e-310
<<< Combine >>>
<<< v10.3.3 >>>
<<< v10.4.1 >>>
>>> Random number generator seed is 123456
>>> Method used is MultiDimFit
Doing initial fit:
Expand Down Expand Up @@ -421,8 +421,8 @@ best fit parameter values:
kl : +1.283
kv : +0.565
k2v : +0.200
mean expected limit: r < 6.95264e-310 +/- 0 @ 95%CL (10 toyMC)
median expected limit: r < 6.95264e-310 @ 95%CL (10 toyMC)
68% expected band : 6.95264e-310 < r < 6.95264e-310
95% expected band : 6.95264e-310 < r < 6.95264e-310
mean expected limit: r < 6.95275e-310 +/- 0 @ 95%CL (10 toyMC)
median expected limit: r < 6.95275e-310 @ 95%CL (10 toyMC)
68% expected band : 6.95275e-310 < r < 6.95275e-310
95% expected band : 6.95275e-310 < r < 6.95275e-310
Out of 10 toys, {'kl': 0, 'kv': 0, 'k2v': 0} are not matching (tolerance: 1e-4) between CMSHistFunc and CMSHistSum