From 9bc6e9859e03e373d51212d3dc86ce4ce8a947a9 Mon Sep 17 00:00:00 2001 From: Kipp Cannon <kipp.cannon@ligo.org> Date: Thu, 29 Mar 2018 18:06:21 +0900 Subject: [PATCH] inspiral.py: house keeping - some changes in logic never made it into the .flush() path - reduce line count in gracedb path --- gstlal-inspiral/python/inspiral.py | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/gstlal-inspiral/python/inspiral.py b/gstlal-inspiral/python/inspiral.py index ef8de4f6b1..549d2bbb8d 100644 --- a/gstlal-inspiral/python/inspiral.py +++ b/gstlal-inspiral/python/inspiral.py @@ -819,8 +819,7 @@ class Data(object): self.rankingstat.denominator.increment(event) self.coincs_document.commit() - # update zero-lag coinc bin counts in - # rankingstat. + # update zero-lag bin counts in rankingstat. if self.stream_thinca.last_coincs: for coinc_event_id, coinc_event in self.stream_thinca.last_coincs.coinc_event_index.items(): if coinc_event.time_slide_id in self.stream_thinca.last_coincs.zero_lag_time_slide_ids: @@ -922,11 +921,10 @@ class Data(object): self.rankingstat.denominator.increment(event) self.coincs_document.commit() - # update zero-lag bin counts in rankingstat + # update zero-lag bin counts in rankingstat. if self.stream_thinca.last_coincs: for coinc_event_id, coinc_event in self.stream_thinca.last_coincs.coinc_event_index.items(): - offset_vector = self.stream_thinca.last_coincs.offset_vector(coinc_event.time_slide_id) - if not any(offset_vector.values()): + if coinc_event.time_slide_id in self.stream_thinca.last_coincs.zero_lag_time_slide_ids: for event in self.stream_thinca.last_coincs.sngl_inspirals(coinc_event_id): self.rankingstat.zerolag.increment(event) @@ -1030,8 +1028,7 @@ class Data(object): for event in self.stream_thinca.last_coincs.sngl_inspirals(coinc_event.coinc_event_id): snr_time_series = event.snr_time_series if snr_time_series is not None: - snr_time_series = xmldoc.childNodes[-1].appendChild(lalseries.build_COMPLEX8TimeSeries(snr_time_series)) - snr_time_series.appendChild(ligolw_param.Param.from_pyvalue(u"event_id", event.event_id)) + xmldoc.childNodes[-1].appendChild(lalseries.build_COMPLEX8TimeSeries(snr_time_series)).appendChild(ligolw_param.Param.from_pyvalue(u"event_id", event.event_id)) # serialize to XML ligolw_utils.write_fileobj(xmldoc, message, gz = False) xmldoc.unlink() -- GitLab