Commit d011d35f authored by James Clark's avatar James Clark

Merge branch 'ligo.lw' into 'master'

glue.ligolw -> ligo.lw conversion

See merge request !60
parents d71b0b66 382f5b70
Pipeline #47197 passed with stages
in 3 minutes and 18 seconds
......@@ -22,9 +22,9 @@ from __future__ import print_function
import sys,os,subprocess
from glue import pipeline
from glue.ligolw import ligolw
from glue.ligolw import utils as ligolw_utils
from glue.ligolw import lsctables
from ligo.lw import ligolw
from ligo.lw import utils as ligolw_utils
from ligo.lw import lsctables
#import lalinspiral, lalburst
import itertools
......
......@@ -2,9 +2,9 @@ import numpy as np
import os
try:
import glue.ligolw.utils
import glue.ligolw.table
import glue.ligolw.lsctables
import ligo.lw.utils
import ligo.lw.table
import ligo.lw.lsctables
except:
print("WARNING: glue modules not found. Will not be able to read XML tables")
......@@ -31,8 +31,8 @@ class Mdc:
# -- Read a CBC XML table
if fileExtension == '.xml':
print("READING CBC XML TABLE")
xmldoc = glue.ligolw.utils.load_filename(filename, verbose=False)
injs = glue.ligolw.table.get_table(xmldoc,glue.ligolw.lsctables.SimInspiralTable.tableName)
xmldoc = ligo.lw.utils.load_filename(filename, verbose=False)
injs = ligo.lw.table.get_table(xmldoc,ligo.lw.lsctables.SimInspiralTable.tableName)
gpsList = np.zeros(len(injs))
longList = np.zeros(len(injs))
......
......@@ -18,10 +18,10 @@ import getopt
import math
from optparse import OptionParser
from glue.ligolw import ligolw
from glue.ligolw import lsctables
from glue.ligolw import table
from glue.ligolw import utils
from ligo.lw import ligolw
from ligo.lw import lsctables
from ligo.lw import table
from ligo.lw import utils
class LIGOLWContentHandler(ligolw.LIGOLWContentHandler):
pass
......
......@@ -8,7 +8,9 @@ RUN apt-get update && apt-get install --assume-yes \
build-essential \
pkg-config \
python-pip \
git
git \
python-ligo-lw
RUN python -m pip install --upgrade setuptools
# Copy and build BayesWave
......
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