From f8ae889f605ea2be6309dd72b45adebf8422207d Mon Sep 17 00:00:00 2001
From: Kipp Cannon <kcannon@cita.utoronto.ca>
Date: Thu, 12 Apr 2018 02:44:16 +0900
Subject: [PATCH] gstlal_inspiral: set numerator in ranking stat output
- when collecting trigger histograms from scratch, initialize the numerator with the signal model so that the resulting ranking statistic file is closer to being in a usable state as-is, without having to mix in the output of gstlal_inspiral_create_prior_diststats
- this has been made possible by the recent change to the numerator's .__iadd__() method that causes overall histogram count to be preserved across marginalization operations
- teach gstlal_inspiral_pipe to disable numerator initialization in the create_prior_diststats jobs since it is not longer required
---
gstlal-inspiral/bin/gstlal_inspiral | 1 +
gstlal-inspiral/bin/gstlal_inspiral_pipe | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/gstlal-inspiral/bin/gstlal_inspiral b/gstlal-inspiral/bin/gstlal_inspiral
index 9960121489..4ac2e9bc53 100755
--- a/gstlal-inspiral/bin/gstlal_inspiral
+++ b/gstlal-inspiral/bin/gstlal_inspiral
@@ -755,6 +755,7 @@ for output_file_number, (svd_bank_url_dict, output_url, likelihood_url_namedtupl
raise ValueError("\"%s\" is for the wrong templates")
else:
rankingstat = far.RankingStat(template_ids = template_ids, instruments = all_instruments, delta_t = options.coincidence_threshold, min_instruments = options.min_instruments)
+ rankingstat.numerator.add_signal_model(df = 40)
#
diff --git a/gstlal-inspiral/bin/gstlal_inspiral_pipe b/gstlal-inspiral/bin/gstlal_inspiral_pipe
index 8190fb4ba7..1a6c852701 100755
--- a/gstlal-inspiral/bin/gstlal_inspiral_pipe
+++ b/gstlal-inspiral/bin/gstlal_inspiral_pipe
@@ -551,7 +551,7 @@ def rank_and_merge(dag, createPriorDistStatsJob, calcRankPDFsJob, calcRankPDFsWi
# the time being.
priornode = inspiral_pipe.generic_node(createPriorDistStatsJob, dag,
parent_nodes = [],
- opts = {"instrument":instrument_set, "synthesize-numerator":"", "background-prior":1, "min-instruments":options.min_instruments},
+ opts = {"instrument":instrument_set, "background-prior":1, "min-instruments":options.min_instruments},
output_files = {"write-likelihood":inspiral_pipe.T050017_filename(instruments, '%04d_CREATE_PRIOR_DIST_STATS' % (n,), boundary_seg, '.xml.gz', path = createPriorDistStatsJob.output_path)}
)
# Create a file that has the priors *and* all of the diststats
--
GitLab