diff --git a/lalapps/src/string/lalapps_cosmicstring_pipe.py b/lalapps/src/string/lalapps_cosmicstring_pipe.py index 8db8e75a182dbdf3ffaa70e7680b9dc4b2d0ee06..f835d41b82338f0f6917df7929df0f809bfe2658 100644 --- a/lalapps/src/string/lalapps_cosmicstring_pipe.py +++ b/lalapps/src/string/lalapps_cosmicstring_pipe.py @@ -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: diff --git a/lalapps/src/string/lalapps_string_final.py b/lalapps/src/string/lalapps_string_final.py index 2e743a31684ac15c4cfaf026efa41b3eb35492cf..42e51b49ec4f9909d99a7e0c45d991cb9e8e3f5e 100644 --- a/lalapps/src/string/lalapps_string_final.py +++ b/lalapps/src/string/lalapps_string_final.py @@ -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)