Commit fefaff09 authored by Marcel Rieger's avatar Marcel Rieger
Browse files

Switch to new combine version 8.2.0.

parent bc06e425
......@@ -1258,8 +1258,8 @@ class CreateWorkspace(DatacardTask, CombineCommandTask):
" --physics-option doBRscaling={model.doBRscaling}"
" --physics-option doHscaling={model.doHscaling}"
" --physics-option doklDependentUnc={model.doklDependentUnc}"
" --physics-option doProfilekt={model.doProfilekl}"
" --physics-option doProfilekl={model.doProfilekt}"
" --physics-option doProfilekl={model.doProfilekl}"
" --physics-option doProfilekt={model.doProfilekt}"
" --physics-option doProfileCV={model.doProfileCV}"
" --physics-option doProfileC2V={model.doProfileC2V}"
).format(model=self.load_hh_model()[1])
......
......@@ -543,6 +543,7 @@ class PlotUpperLimitsAtPoint(POIPlotTask, MultiDatacardTask):
significant=False,
description="comma-separated vertical positions of horizontal lines; default: empty",
)
y_min = None
y_max = None
z_min = None
......@@ -558,7 +559,8 @@ class PlotUpperLimitsAtPoint(POIPlotTask, MultiDatacardTask):
# this task depends on the UpperLimits task which does a scan over several parameters, but
# we rather require a single point, so define a pseudo scan parameter for easier handling
pois_with_values = [p for p in self.parameter_values_dict if p in self.all_pois]
self.pseudo_scan_parameter = (pois_with_values + ["kl"])[0]
other_pois = [p for p in (self.k_pois + self.r_pois) if p != self.pois[0]]
self.pseudo_scan_parameter = (pois_with_values + other_pois)[0]
def requires(self):
scan_parameter_value = self.parameter_values_dict.get(self.pseudo_scan_parameter, 1.0)
......
......@@ -196,8 +196,8 @@ class MergePullsAndImpacts(PullsAndImpactsBase):
msg += " You can try to remove the corresponding output files via\n\n"
for _, _, path in fail_info:
msg += " rm {}\n".format(path)
msg += "\n and then add different fit stability options such as\n\n"
msg += c(" --PullsAndImpacts-custom-args='--X-rtd MINIMIZER_analytic'\n",
msg += "\n and then add different options such as\n\n"
msg += c(" --PullsAndImpacts-custom-args='--X-rtd MINIMIZER_no_analytic'\n",
style="bright")
msg += "\n to your 'law run ...' command.\n\n"
msg += " " + c("2.", "magenta")
......
......@@ -54,7 +54,7 @@ setup() {
# combine setup
#
local combine_version="1"
local combine_version="2"
local flag_file_combine="$DHI_SOFTWARE/.combine_good"
[ "$DHI_REINSTALL_COMBINE" = "1" ] && rm -f "$flag_file_combine"
if [ ! -f "$flag_file_combine" ]; then
......@@ -64,8 +64,10 @@ setup() {
(
cd "$DHI_SOFTWARE"
rm -rf HiggsAnalysis/CombinedLimit
git clone --depth 1 --branch 102x https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git HiggsAnalysis/CombinedLimit && \
git clone --depth 1 https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git HiggsAnalysis/CombinedLimit && \
cd HiggsAnalysis/CombinedLimit && \
git fetch --tags && \
git checkout tags/v8.2.0 && \
source env_standalone.sh "" && \
make -j && \
make
......@@ -190,11 +192,17 @@ setup() {
if [ -d "$DHI_BASE/.git" ]; then
for m in law plotlib; do
local mpath="$DHI_BASE/modules/$m"
# update and potentially initialize the submodule when the directory is either empty
# or there are no changes
# initialize the submodule when the directory is empty
local mfiles=( "$mpath"/* )
if [ "${#mfiles}" = "0" ] || [ "$( cd "$mpath"; git status --porcelain=v1 2>/dev/null | wc -l )" = "0" ]; then
if [ "${#mfiles}" = "0" ]; then
git submodule update --init --recursive "$mpath"
else
# update when not on a working branch and there are no changes
local detached_head="$( ( cd "$mpath"; git symbolic-ref -q HEAD &> /dev/null ) && echo true || echo false )"
local changed_files="$( cd "$mpath"; git status --porcelain=v1 2> /dev/null | wc -l )"
if ! $detached_head && [ "$changed_files" = "0" ]; then
git submodule update --init --recursive "$mpath"
fi
fi
done
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment