Merge branch 'ligo.lw' into 'master'

glue.ligolw -> ligo.lw conversion

See merge request lscsoft/bayeswave!60

BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py

@@ -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

BayesWaveUtils/bayeswave_plot/find_trig.py

@@ -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))

BayesWaveUtils/scripts/megasky.py

@@ -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

Dockerfile

@@ -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