Commit 5ac17fd0 authored by Kipp Cannon's avatar Kipp Cannon

lalinference: replace deprecated function

- glue.ligolw.lsctables.instrument_set_from_ifos() --> glue.ligolw.lsctables.instrumentsproperty.get()
- refs #5387
Original: 186d674dc840aaf0f29ed22124188069f664a9ba
parent 7e4f2b2e
...@@ -342,7 +342,7 @@ for sim_inspiral in progress.iterate(sim_inspiral_table): ...@@ -342,7 +342,7 @@ for sim_inspiral in progress.iterate(sim_inspiral_table):
# Add CoincInspiral table entry. # Add CoincInspiral table entry.
coinc_inspiral = lsctables.CoincInspiral() coinc_inspiral = lsctables.CoincInspiral()
coinc_inspiral.coinc_event_id = coinc.coinc_event_id coinc_inspiral.coinc_event_id = coinc.coinc_event_id
coinc_inspiral.ifos = lsctables.ifos_from_instrument_set( coinc_inspiral.ifos = lsctables.instrumentsproperty.set(
sngl_inspiral.ifo for sngl_inspiral in sngl_inspirals) sngl_inspiral.ifo for sngl_inspiral in sngl_inspirals)
coinc_inspiral.end = lal.LIGOTimeGPS( coinc_inspiral.end = lal.LIGOTimeGPS(
sum(sngl_inspiral.end.ns() for sngl_inspiral in sngl_inspirals) sum(sngl_inspiral.end.ns() for sngl_inspiral in sngl_inspirals)
......
...@@ -191,12 +191,12 @@ def identity(x): ...@@ -191,12 +191,12 @@ def identity(x):
def instruments_to_fits(value): def instruments_to_fits(value):
if not isinstance(value, six.string_types): if not isinstance(value, six.string_types):
value = str(lsctables.ifos_from_instrument_set(value)) value = str(lsctables.instrumentsproperty.set(value))
return value return value
def instruments_from_fits(value): def instruments_from_fits(value):
return {str(ifo) for ifo in lsctables.instrument_set_from_ifos(value)} return {str(ifo) for ifo in lsctables.instrumentsproperty.get(value)}
DEFAULT_NUNIQ_NAMES = ('PROBDENSITY', 'DISTMU', 'DISTSIGMA', 'DISTNORM') DEFAULT_NUNIQ_NAMES = ('PROBDENSITY', 'DISTMU', 'DISTSIGMA', 'DISTNORM')
......
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