Commit a9a6d422 authored by Kipp Cannon's avatar Kipp Cannon

lalapps/src/string: replace deprecated function

- glue.ligolw.lsctables.instrument_set_from_ifos() --> glue.ligolw.lsctables.instrumentsproperty.get()
Original: ac7dca1c7056afff281b2645cb4539bb14b0e66e
parent 6ccd6a9b
......@@ -174,7 +174,7 @@ overlap = short_segment_duration / 2 + 2 * pad # FIXME: correct?
# get the instruments and raw segments
#
instruments = lsctables.instrument_set_from_ifos(config_parser.get('pipeline','ifos'))
instruments = lsctables.instrumentsproperty.get(config_parser.get('pipeline','ifos'))
seglists = ligolwsegments.segmenttable_get_by_name(utils.load_filename(options.segments_file, gz = (options.segments_file or "stdin").endswith(".gz"), verbose = options.verbose), options.segments_name).coalesce()
# remove extra instruments
for instrument in set(seglists) - instruments:
......
......@@ -263,7 +263,7 @@ WHERE
""", (contents.bb_definer_id,)):
# likelihood ratio must be listed first to
# act as the sort key
record = (likelihood_ratio, contents.filename, coinc_event_id, dbtables.lsctables.instrument_set_from_ifos(instruments), peak_time)
record = (likelihood_ratio, contents.filename, coinc_event_id, dbtables.lsctables.instrumentsproperty.get(instruments), peak_time)
if likelihood_ratio is None:
# coinc got vetoed (unable to compute
# likelihood)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment