From efaa6ec4a2d21ef24a1d3f5bf705e00c0caac711 Mon Sep 17 00:00:00 2001
From: "patrick.godwin" <patrick.godwin@ligo.org>
Date: Fri, 29 Jul 2022 12:58:15 -0400
Subject: [PATCH] (conflict solved) add all auxiliary ranking stat files for
jobs that require it
---
.../python/dags/layers/inspiral.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/gstlal-inspiral/python/dags/layers/inspiral.py b/gstlal-inspiral/python/dags/layers/inspiral.py
index 1ea49126eb..df16babf17 100644
--- a/gstlal-inspiral/python/dags/layers/inspiral.py
+++ b/gstlal-inspiral/python/dags/layers/inspiral.py
@@ -570,7 +570,6 @@ def marginalize_layer(config, dag, prior_cache, dist_stat_cache):
layer += Node(
arguments = Option("marginalize", "ranking-stat"),
inputs = [
- Argument("mass-model", config.prior.mass_model, track=False, suppress=True),
Argument("dist-stats", dist_stats[svd_bin].files + prior[svd_bin].files),
*add_ranking_stat_file_options(config, svd_bin, transfer_only=True),
],
@@ -612,8 +611,8 @@ def calc_pdf_layer(config, dag, dist_stat_cache):
Option("num-cores", num_cores),
],
inputs = [
- Argument("mass-model", config.prior.mass_model, track=False, suppress=True),
Argument("dist-stats", dist_stats[svd_bin].files),
+ *add_ranking_stat_file_options(config, svd_bin, transfer_only=True),
],
outputs = Option("output", pdfs.files)
)
@@ -738,7 +737,6 @@ def calc_likelihood_layer(config, dag, trigger_cache, dist_stat_cache):
layer += Node(
arguments = arguments,
inputs = [
- Argument("mass-model", config.prior.mass_model, track=False, suppress=True),
Argument("triggers", triggers.files),
Option("likelihood-url", dist_stats[svd_bin].files),
*add_ranking_stat_file_options(config, svd_bin, transfer_only=True),
@@ -1266,7 +1264,7 @@ def measure_lnlr_cdf_layer(config, dag, dist_stats_cache, injection_cache):
inputs = [
Option("injection-template-match-file", injections.files),
Option("likelihood-url", dist_stats.files),
- Argument("mass-model", config.prior.mass_model, track=False, suppress=True),
+ *add_ranking_stat_file_options(config, transfer_only=True),
],
outputs = Option("output-file", lnlr_cdfs.files),
)
@@ -1577,7 +1575,7 @@ def plot_bin_background_layer(config, dag, marg_dist_stat_cache):
layer += Node(
inputs = [
Argument("marg-files", marg_dist_stats.files),
- Argument("mass-model", config.prior.mass_model, track=False, suppress=True),
+ *add_ranking_stat_file_options(config, transfer_only=True),
],
outputs = Option("output-dir", "plots"),
)
@@ -2223,7 +2221,8 @@ def track_noise_layer(config, dag):
if config.filter.injections:
dag.attach(inj_layer)
-def add_ranking_stat_file_options(config, svd_bin, transfer_only=False):
+
+def add_ranking_stat_file_options(config, svd_bin=None, transfer_only=False):
"""
Return a list of options relating to files used for
terms in the ranking statistic,
@@ -2250,8 +2249,12 @@ def add_ranking_stat_file_options(config, svd_bin, transfer_only=False):
if config.prior.dtdphi:
if isinstance(config.prior.dtdphi, Mapping):
- sub_bank = config.svd.stats.bins[svd_bin]["bank_name"]
- inputs.append(Option("dtdphi-file", config.prior.dtdphi[sub_bank], **kwargs))
+ if svd_bin is None:
+ dtdphi_files = list(config.prior.dtdphi.values())
+ inputs.append(Option("dtdphi-file", dtdphi_files, **kwargs))
+ else:
+ sub_bank = config.svd.stats.bins[svd_bin]["bank_name"]
+ inputs.append(Option("dtdphi-file", config.prior.dtdphi[sub_bank], **kwargs))
else:
inputs.append(Option("dtdphi-file", config.prior.dtdphi, **kwargs))
--
GitLab