Commit 91c2bad0 authored by Adam Mercer's avatar Adam Mercer
Browse files

Merge branch 'ligo-segments' into 'master'

Updated LAL to use ligo-segments

See merge request !293
parents 82d8ea87 61dffc12
Pipeline #22887 passed with stages
in 161 minutes and 15 seconds
......@@ -13,10 +13,12 @@ Build-Depends: bc,
liboctave-dev,
pkg-config,
python-all-dev,
python-ligo-segments,
python-glue (>= @MIN_GLUE_VERSION@),
python-numpy,
python-six,
python3-all-dev,
python3-ligo-segments,
python3-glue (>= @MIN_GLUE_VERSION@),
python3-numpy,
python3-six,
......@@ -68,6 +70,7 @@ Architecture: any
Depends: ${misc:Depends},
${python:Depends},
${shlibs:Depends},
python-ligo-segments,
python-glue (>= @MIN_GLUE_VERSION@),
python-six,
lal (= ${binary:Version})
......@@ -92,6 +95,7 @@ Architecture: any
Depends: ${misc:Depends},
${python3:Depends},
${shlibs:Depends},
python3-ligo-segments,
python3-glue (>= @MIN_GLUE_VERSION@),
python3-six,
lal (= ${binary:Version})
......
......@@ -15,6 +15,7 @@ URL: https://wiki.ligo.org/DASWG/LALSuite
Packager: Adam Mercer <adam.mercer@ligo.org>
BuildRequires: bc
BuildRequires: fftw-devel
BuildRequires: python2-ligo-segments
BuildRequires: glue >= @MIN_GLUE_VERSION@
BuildRequires: gsl-devel
BuildRequires: hdf5-devel
......@@ -51,6 +52,7 @@ as well as the documentation for the library.
Summary: Python bindings for LAL
Group: LAL
Requires: %{name} = %{version}
Requires: python2-ligo-segments
Requires: glue >= @MIN_GLUE_VERSION@
Requires: numpy
Requires: python
......
......@@ -63,9 +63,9 @@ else:
'''
from scipy.signal import signaltools
from ligo import segments
from glue import iterutils
from glue import segments
from glue.ligolw import ligolw
from glue.ligolw import array as ligolw_array
from glue.ligolw import param as ligolw_param
......@@ -922,7 +922,7 @@ class Categories(Bins):
Example with continuous values:
>>> from glue.segments import *
>>> from ligo.segments import *
>>> categories = Categories([
... segmentlist([segment(1, 3), segment(5, 7)]),
... segmentlist([segment(0, PosInfinity)])
......@@ -1348,7 +1348,7 @@ def bins_spanned(bins, seglist):
Example:
>>> from glue.segments import *
>>> from ligo.segments import *
>>> s = segmentlist([segment(1.5, 10.333), segment(15.8, 24)])
>>> b = LinearBins(0, 30, 100)
>>> bins_spanned(b, s)
......
......@@ -25,7 +25,7 @@ import tempfile
from functools import total_ordering
from six.moves import urllib
from glue import segments
from ligo import segments
from .. import git_version
from ..lal import CacheImport
......@@ -91,7 +91,7 @@ class CacheEntry(object):
The values for these columns are stored in the .observatory,
.description, .segment and .url attributes of instances of this class,
respectively. The .segment attribute stores a glue.segments.segment
respectively. The .segment attribute stores a ligo.segments.segment
object describing the interval spanned by the file. Any of these
attributes except the URL is allowed to be None.
......@@ -115,7 +115,7 @@ class CacheEntry(object):
Example (extract segmentlist dictionary from LAL cache):
>>> from glue import segments
>>> from ligo import segments
>>> seglists = segments.segmentlistdict()
>>> for cacheentry in cache:
... seglists |= cacheentry.segmentlistdict
......
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