gstlal_inspiral, gstlal_inspiral_create_prior_diststats: use...

gstlal_inspiral, gstlal_inspiral_create_prior_diststats: use gstlal_inspiral_create_prior_diststats to make the numerator not gstlal inspiral


(cherry picked from commit e83495cf)

gstlal-inspiral/bin/gstlal_inspiral

@@ -800,7 +800,6 @@ for output_file_number, (svd_bank_url_dict, output_url, ranking_stat_output_url,
 			rankingstat.numerator.set_horizon_factors(horizon_factors)
 	if rankingstat is None:
 		rankingstat = far.RankingStat(template_ids = template_ids, instruments = all_instruments, delta_t = options.coincidence_threshold, min_instruments = options.min_instruments, horizon_factors = horizon_factors)
-		rankingstat.numerator.add_signal_model()
 
 
 	#

gstlal-inspiral/bin/gstlal_inspiral_create_prior_diststats

@@ -71,7 +71,6 @@ def parse_command_line():
 		version = "Name: %%prog\n%s" % "" # FIXME
 	)
 	parser.add_option("-v", "--verbose", action = "store_true", help = "Be verbose.")
-	parser.add_option("-s", "--synthesize-numerator", action = "store_true", help = "Synthesize a numerator (SNR, \\chi^2) distribution.")
 	# FIXME:  default must be identical to gstlal_inspiral's default
 	parser.add_option("--coincidence-threshold", metavar = "value", type = "float", default = 0.005, help = "Set the coincidence window in seconds (default = 0.005).  The light-travel time between instruments will be added automatically in the coincidence test.")
 	# FIXME:  default must be identical to gstlal_inspiral's default
@@ -163,8 +162,8 @@ rankingstat = far.RankingStat(template_ids = template_ids, instruments = options
 if options.background_prior > 0:
 	rankingstat.denominator.add_noise_model(number_of_events = options.background_prior, df = int(options.df))
 
-if options.synthesize_numerator:
-	rankingstat.numerator.add_signal_model()
+# Add the numerator
+rankingstat.numerator.add_signal_model()
 
 
 #