Commit 1e49c868 authored by Marcel Rieger's avatar Marcel Rieger
Browse files

Fix hh model output path, silently index in setup.sh.

parent f7df8169
......@@ -263,7 +263,10 @@ class HHModelTask(AnalysisTask):
module_id, model_name, options = self.split_hh_model()
part = "{}__{}".format(module_id.replace(".", "_"), model_name)
if options:
fmt = lambda k, v: (k, v.replace("=", "").replace("/", "").replace(",", ""))
def fmt(k, v):
if isinstance(v, six.string_types):
return (k, v.replace("=", "").replace("/", "").replace(",", ""))
return (k, v)
part += "__" + "_".join("{}{}".format(*fmt(k, v)) for k, v in options.items())
parts["hh_model"] = part
......
Subproject commit 1f28eb4853f603a1046d29941a0203ead32617c4
Subproject commit b9c7acb19a6a36d80dfa4edb85f88fad6008ea33
......@@ -58,7 +58,7 @@ setup() {
local flag_file_combine="$DHI_SOFTWARE/.combine_good"
[ "$DHI_REINSTALL_COMBINE" = "1" ] && rm -f "$flag_file_combine"
if [ ! -f "$flag_file_combine" ]; then
echo "installing combine into $DHI_SOFTWARE/HiggsAnalysis/CombinedLimit"
echo "installing combine at $DHI_SOFTWARE/HiggsAnalysis/CombinedLimit"
mkdir -p "$DHI_SOFTWARE"
(
......@@ -133,7 +133,7 @@ setup() {
local flag_file_sw="$DHI_SOFTWARE/.sw_good"
[ "$DHI_REINSTALL_SOFTWARE" = "1" ] && rm -f "$flag_file_sw"
if [ ! -f "$flag_file_sw" ]; then
echo "installing software stack into $DHI_SOFTWARE"
echo "installing software stack at $DHI_SOFTWARE"
rm -rf "$DHI_SOFTWARE/lib"
mkdir -p "$DHI_SOFTWARE"
......@@ -215,8 +215,13 @@ setup() {
export LAW_HOME="$DHI_BASE/.law"
export LAW_CONFIG_FILE="$DHI_BASE/law.cfg"
# source law's bash completion scipt
which law &> /dev/null && source "$( law completion )" ""
if which law &> /dev/null; then
# source law's bash completion scipt
source "$( law completion )" ""
# silently index
law index -q
fi
}
interactive_setup() {
......
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