Process injections in online analysis

gstlal-inspiral/bin/gstlal_inspiral

@@ -373,8 +373,10 @@ def parse_command_line():
 		raise ValueError("must supply exactly as many --svd-bank options as --output")
 	if options.ranking_stat_output and len(options.ranking_stat_output) != len(options.output):
 		raise ValueError("must supply either none or exactly as many --ranking-stat-output options as --output")
-	if options.likelihood_snapshot_interval and not options.ranking_stat_output:
+	if (options.likelihood_snapshot_interval and not options.ranking_stat_output) and not options.injections:
 		raise ValueError("must set --ranking-stat-output when --likelihood-snapshot-interval is set")
+	if options.ranking_stat_output and options.injections:
+		raise ValueError("must not set --ranking-stat-output when --injections is set")
 	if options.ranking_stat_output is None or len(options.ranking_stat_output) == 0:
 		options.ranking_stat_output = [None] * len(options.output)
 
@@ -403,9 +405,12 @@ def parse_command_line():
 
 	if options.data_source in ("lvshm", "framexmit"):
 		missing_options = []
-		for option in ["job_tag", "ranking_stat_input", "ranking_stat_pdf", "zerolag_rankingstat_pdf"]:
+		for option in ["job_tag", "ranking_stat_input", "ranking_stat_pdf"]:
 			if getattr(options, option) is None:
 				missing_options.append("--%s" %option.replace("_","-"))
+		if not options.injections:
+			if options.zerolag_rankingstat_pdf is None:
+				missing_options.append("--zerolag-rankingstat-pdf")
 
 		if missing_options:
 			raise ValueError("missing required option(s) %s when --data-source is lvshm or framexmit" % ", ".join(missing_options))
@@ -776,7 +781,7 @@ for output_file_number, (svd_bank_url_dict, output_url, ranking_stat_output_url,
 	# the new injection file to disk before the pipeline starts up
 	#
 
-	if options.injections and options.reference_psd:
+	if (options.injections and options.reference_psd) and not options.data_source in ("lvshm", "framexmit"):
 		if options.verbose:
 			print("calculating expected SNR for injections...", file=sys.stderr)
 

gstlal-inspiral/bin/gstlal_ll_inspiral_workflow

@@ -60,9 +60,9 @@ else:
 	marg_pdf = DataCache.generate(DataType.DIST_STAT_PDFS, config.all_ifos)
 
 	# generate dag layers
-	dag.filter_online(svd_banks, dist_stats, zerolag_pdfs, marg_pdf)
 	if config.filter.injections:
 		dag.filter_injections_online(svd_banks, dist_stats, zerolag_pdfs, marg_pdf)
+	dag.filter_online(svd_banks, dist_stats, zerolag_pdfs, marg_pdf)
 	dag.marginalize_online(marg_pdf)
 	dag.track_noise()
 	if config.services.kafka_server:

gstlal-inspiral/python/inspiral.py

@@ -63,6 +63,7 @@ import time
 import http.client
 import tempfile
 import os
+import bisect
 from urllib.parse import urlparse
 
 from ligo.lw import ligolw
@@ -406,7 +407,13 @@ class CoincsDocument(object):
 		#
 
 		if injection_filename is not None:
-			ligolw_add.ligolw_add(self.xmldoc, [injection_filename], contenthandler = LIGOLWContentHandler, verbose = verbose)
+			# sort and add the sim_insprial
+			xmldoc_sim_inspiral = ligolw_utils.load_filename(injection_filename, verbose = verbose, contenthandler = LIGOLWContentHandler)
+			self.sim_inspiral_table = lsctables.SimInspiralTable.get_table(xmldoc_sim_inspiral)
+			self.sim_inspiral_table.sort(key=lambda s:s.geocent_end_time+1.e-9*s.geocent_end_time_ns)
+			self.xmldoc.childNodes[-1].appendChild(self.sim_inspiral_table)
+		else:
+			self.sim_inspiral_table = None
 
 		#
 		# insert time slide offset vectors.  remove duplicate
@@ -655,7 +662,18 @@ class GracedBWrapper(object):
 		self.__upload_aux_data(message, filename, tag, fobj.getvalue(), gracedb_ids)
 		del fobj
 
-	def do_alerts(self, last_coincs, psddict, rankingstat_xmldoc_func, seglistdicts, get_p_astro_func):
+	def nearest_sim_table(self, gps_time, sim_inspiral):
+		# search through the sim inspiral table
+		# find the row with geo-centric ends time nearest to the specific gps time (using by bisect)
+		# return the new sim inspiral table with a single row corresponding to the nearest time 
+		sim_inspiral_table = lsctables.New(lsctables.SimInspiralTable)
+		end_times = [inj.time_geocent for inj in sim_inspiral]
+		idx = bisect.bisect_left(end_times, gps_time)
+		row = sim_inspiral[idx]
+		sim_inspiral_table.append(row)
+		return sim_inspiral_table
+
+	def do_alerts(self, last_coincs, psddict, rankingstat_xmldoc_func, seglistdicts, get_p_astro_func, sim_inspiral_table = None):
 		gracedb_ids = []
 
 		# no-op short circuit
@@ -724,6 +742,10 @@ class GracedBWrapper(object):
 			print("sending %s to gracedb ..." % filename, file=sys.stderr)
 			message = io.BytesIO()
 			xmldoc = last_coincs[coinc_event.coinc_event_id]
+
+			if sim_inspiral_table:
+				xmldoc.childNodes[-1].appendChild(self.nearest_sim_table(end_time, sim_inspiral_table))
+
 			# give the alert all the standard inspiral
 			# columns (attributes should all be
 			# populated).  FIXME:  ugly.

gstlal-inspiral/python/lloidhandler.py

@@ -1498,7 +1498,7 @@ class Handler(simplehandler.Handler):
 		assert self.fapfar is not None
 
 		# do alerts
-		self.gracedbwrapper.do_alerts(last_coincs, self.psds, self.__get_rankingstat_xmldoc_for_gracedb, self.segmentstracker.seglistdicts, self.__get_p_astro_json)
+		self.gracedbwrapper.do_alerts(last_coincs, self.psds, self.__get_rankingstat_xmldoc_for_gracedb, self.segmentstracker.seglistdicts, self.__get_p_astro_json, sim_inspiral_table = self.coincs_document.sim_inspiral_table)
 
 
 	def web_get_sngls_snr_threshold(self):