From 67fc343ebc00c86b9a1a375dcd5bae36b29c3509 Mon Sep 17 00:00:00 2001
From: Torben Lange <torben.lange@cern.ch>
Date: Wed, 21 Feb 2024 13:19:33 +0100
Subject: [PATCH] Another try to allow for custom combine..
---
setup.sh | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/setup.sh b/setup.sh
index a14345cc..17166f96 100644
--- a/setup.sh
+++ b/setup.sh
@@ -138,15 +138,12 @@ setup() {
scram b
) || return "$?"
- local combine_install="${DHI_COMBINE_VERSION} https://github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git"
- if [ -z ${DHI_COMBINE_REPO} ]; then
- local combine_install="${DHI_COMBINE_VERSION} ${DHI_COMBINE_REPO}"
- fi
+ [ -z "${DHI_COMBINE_REPO}" ] && export DHI_COMBINE_REPO="//github.com/cms-analysis/HiggsAnalysis-CombinedLimit.git"
# add combine
(
cd "${DHI_CMSSW_BASE}/${DHI_CMSSW_VERSION}/src"
eval "$( scramv1 runtime -sh )" && \
- git clone --branch ${combine_install} HiggsAnalysis/CombinedLimit && \
+ git clone --branch ${DHI_COMBINE_VERSION} ${DHI_COMBINE_REPO} HiggsAnalysis/CombinedLimit && \
cd HiggsAnalysis/CombinedLimit && \
chmod ug+x test/diffNuisances.py && \
( [ "${DHI_COMBINE_PYTHON_ONLY}" = "1" ] && scram b python || scram b -j "${DHI_INSTALL_CORES}" )
--
GitLab