From f3de1c9b03729cd0b6bcfca2761f5619ef31a7eb Mon Sep 17 00:00:00 2001 From: Kipp Cannon <kipp.cannon@ligo.org> Date: Thu, 20 Aug 2020 15:25:45 +0900 Subject: [PATCH] update for iterutils.py migration - was in glue, now is in lalsuite --- gstlal-inspiral/bin/gstlal_inspiral_plot_sensitivity | 2 +- gstlal-inspiral/bin/gstlal_inspiral_plotsummary | 2 +- gstlal-inspiral/python/inspiral.py | 2 +- gstlal-inspiral/python/lloidparts.py | 2 +- gstlal-inspiral/python/spiirparts.py | 4 ++-- gstlal/python/pipeparts/__init__.py | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/gstlal-inspiral/bin/gstlal_inspiral_plot_sensitivity b/gstlal-inspiral/bin/gstlal_inspiral_plot_sensitivity index 70ddf21d6b..e1ab06fd1b 100755 --- a/gstlal-inspiral/bin/gstlal_inspiral_plot_sensitivity +++ b/gstlal-inspiral/bin/gstlal_inspiral_plot_sensitivity @@ -40,11 +40,11 @@ from ligo.lw import lsctables from ligo.lw import dbtables from ligo.lw import utils as ligolw_utils from ligo.lw import array as ligolw_array -from glue import iterutils from ligo import segments from ligo.segments import utils as segmentsUtils import lal +from lal import iterutils from lal import rate from lal.utils import CacheEntry diff --git a/gstlal-inspiral/bin/gstlal_inspiral_plotsummary b/gstlal-inspiral/bin/gstlal_inspiral_plotsummary index bf860d6ebb..02b677e3dc 100755 --- a/gstlal-inspiral/bin/gstlal_inspiral_plotsummary +++ b/gstlal-inspiral/bin/gstlal_inspiral_plotsummary @@ -58,9 +58,9 @@ import sys import lal from lal import gpstime +from lal import iterutils from lal.utils import CacheEntry -from glue import iterutils from ligo import segments from ligo.lw import dbtables from ligo.lw import lsctables diff --git a/gstlal-inspiral/python/inspiral.py b/gstlal-inspiral/python/inspiral.py index cde38cae1d..d7b1646cbd 100644 --- a/gstlal-inspiral/python/inspiral.py +++ b/gstlal-inspiral/python/inspiral.py @@ -63,7 +63,6 @@ import tempfile import os from urllib.parse import urlparse -from glue import iterutils from ligo.lw import ligolw from ligo.lw import dbtables from ligo.lw import ilwd @@ -77,6 +76,7 @@ from ligo.lw.utils import process as ligolw_process from ligo.lw.utils import segments as ligolw_segments from ligo.lw.utils import time_slide as ligolw_time_slide import lal +from lal import iterutils from lal import LIGOTimeGPS from lal import series as lalseries from lalburst.snglcoinc import light_travel_time diff --git a/gstlal-inspiral/python/lloidparts.py b/gstlal-inspiral/python/lloidparts.py index 15dec2090f..504615a876 100644 --- a/gstlal-inspiral/python/lloidparts.py +++ b/gstlal-inspiral/python/lloidparts.py @@ -77,12 +77,12 @@ GObject.threads_init() Gst.init(None) -from glue import iterutils from gstlal import datasource from gstlal import multirate_datasource from gstlal import pipeparts from gstlal import pipeio from gstlal.stats.inspiral_lr import LnLRDensity +from lal import iterutils # diff --git a/gstlal-inspiral/python/spiirparts.py b/gstlal-inspiral/python/spiirparts.py index d0b59d4fa4..ab71ca85c7 100644 --- a/gstlal-inspiral/python/spiirparts.py +++ b/gstlal-inspiral/python/spiirparts.py @@ -42,7 +42,8 @@ pygst.require('0.10') import gst -from glue import iterutils +from lal import iterutils +from lal import LIGOTimeGPS from ligo import segments from ligo.lw import ligolw from ligo.lw import lsctables @@ -56,7 +57,6 @@ from gstlal import pipeio from gstlal import pipeparts from gstlal import simplehandler from gstlal import simulation -from pylal.datatypes import LIGOTimeGPS # # SPIIR many instruments, many template banks diff --git a/gstlal/python/pipeparts/__init__.py b/gstlal/python/pipeparts/__init__.py index 121bfe9f7e..b543a02915 100644 --- a/gstlal/python/pipeparts/__init__.py +++ b/gstlal/python/pipeparts/__init__.py @@ -39,9 +39,9 @@ GObject.threads_init() Gst.init(None) -from glue import iterutils from ligo import segments from gstlal import pipeio +from lal import iterutils from lal import LIGOTimeGPS from lal.utils import CacheEntry -- GitLab