Use glue.ligolw again (gwastro#2221)

* Remove pycbc.ligolw

* Work with new table format

* What is going on here?!?

* Updating to glue changes

.landscape.yml

@@ -9,7 +9,6 @@ ignore-patterns:
     - build/*
     - dist/*
     - PyCBC.egg-info/*
-    - pycbc/ligolw/*
 
 pylint:
   disable:

MANIFEST.in

@@ -1,6 +1,5 @@
 include test/*test*py
 include bin/*
-include pycbc/ligolw/*.h
 recursive-include examples *py *sh *xml
 recursive-include tools *py
 include descr.rst

bin/bank/pycbc_aligned_bank_cat

@@ -28,9 +28,9 @@ import argparse
 import numpy
 import pycbc.version
 import h5py
-from pycbc.ligolw import ligolw
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import utils
+from glue.ligolw import ligolw
+from glue.ligolw import lsctables
+from glue.ligolw import utils
 from pycbc import tmpltbank
 from numpy import loadtxt
 import pycbc

bin/bank/pycbc_bank_verification

@@ -37,7 +37,7 @@ import copy
 import logging
 import numpy
 import h5py
-from pycbc.ligolw import ligolw, table, lsctables, utils as ligolw_utils
+from glue.ligolw import ligolw, table, lsctables, utils as ligolw_utils
 from pycbc import tmpltbank, psd, strain, pnutils
 import matplotlib
 matplotlib.use('Agg')

bin/bank/pycbc_geom_aligned_bank

@@ -34,12 +34,12 @@ import logging
 import distutils.spawn
 import h5py
 from scipy import spatial
-from pycbc.ligolw import ligolw
-from pycbc.ligolw import table
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import ilwd
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw.utils import process as ligolw_process
+from glue.ligolw import ligolw
+from glue.ligolw import table
+from glue.ligolw import lsctables
+from glue.ligolw import ilwd
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw.utils import process as ligolw_process
 import pycbc
 import pycbc.psd
 import pycbc.strain

bin/bank/pycbc_tmpltbank_to_chi_params

@@ -36,7 +36,7 @@ import copy
 import logging
 import numpy
 import h5py
-from pycbc.ligolw import ligolw, table, lsctables, utils as ligolw_utils
+from glue.ligolw import ligolw, table, lsctables, utils as ligolw_utils
 from pycbc import tmpltbank, psd, strain, pnutils
 import matplotlib
 matplotlib.use('Agg')

bin/hdfcoinc/pycbc_coinc_hdfinjfind

@@ -5,7 +5,7 @@ files.
 """
 
 import argparse, h5py, logging, types
-from pycbc.ligolw import ligolw, table, lsctables, utils as ligolw_utils
+from glue.ligolw import ligolw, table, lsctables, utils as ligolw_utils
 from glue import segments
 import os.path, numpy
 from pycbc.events import indices_within_segments as veto_indices

bin/hdfcoinc/pycbc_page_segments

@@ -32,7 +32,7 @@ def timestr(s):
     return t
 
 def get_name(segment_file):
-    from pycbc.ligolw import ligolw, table, lsctables, utils as ligolw_utils
+    from glue.ligolw import ligolw, table, lsctables, utils as ligolw_utils
     # dummy class needed for loading LIGOLW files
     class KF(ligolw.LIGOLWContentHandler):
         pass

bin/hdfcoinc/pycbc_page_segtable

@@ -23,10 +23,10 @@ import numpy
 import pycbc.results
 import sys
 from glue import segments
-from pycbc.ligolw import ligolw
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import table
-from pycbc.ligolw import utils
+from glue.ligolw import ligolw
+from glue.ligolw import lsctables
+from glue.ligolw import table
+from glue.ligolw import utils
 from pycbc.events.veto import get_segment_definer_comments
 from pycbc.results import save_fig_with_metadata
 from pycbc.workflow import SegFile

bin/hdfcoinc/pycbc_page_vetotable

@@ -23,10 +23,10 @@ import numpy
 import pycbc.results
 import sys
 from glue import segments
-from pycbc.ligolw import ligolw
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import table
-from pycbc.ligolw import utils
+from glue.ligolw import ligolw
+from glue.ligolw import lsctables
+from glue.ligolw import table
+from glue.ligolw import utils
 from pycbc.results import save_fig_with_metadata
 import pycbc.version
 

bin/hdfcoinc/pycbc_plot_Nth_loudest_coinc_omicron.py

@@ -9,7 +9,7 @@
 import numpy as np
 import argparse
 import glob
-from pycbc.ligolw import ligolw, lsctables, table, utils
+from glue.ligolw import ligolw, lsctables, table, utils
 import matplotlib
 matplotlib.use('Agg')
 import matplotlib.pyplot as plt

bin/hdfcoinc/pycbc_strip_injections

@@ -1,7 +1,7 @@
 #!/bin/env python
 import numpy, argparse, pycbc.version, pycbc.pnutils, logging
 from pycbc.events import veto
-from pycbc.ligolw import ligolw, table, lsctables, utils as ligolw_utils
+from glue.ligolw import ligolw, table, lsctables, utils as ligolw_utils
 
 effd = {"H1":"eff_dist_h", "L1":"eff_dist_l", "V1":"eff_dist_v"}
 def remove(l, i):

bin/hwinj/pycbc_generate_hwinj

@@ -17,10 +17,10 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 import argparse
-from pycbc.ligolw import ilwd
-from pycbc.ligolw import ligolw
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import utils
+from glue.ligolw import ilwd
+from glue.ligolw import ligolw
+from glue.ligolw import lsctables
+from glue.ligolw import utils
 import logging
 import numpy
 import pycbc

bin/hwinj/pycbc_generate_hwinj_from_xml

@@ -20,7 +20,7 @@ import argparse
 import logging
 import numpy
 import os, sys
-from pycbc.ligolw import ligolw, lsctables, table, utils
+from glue.ligolw import ligolw, lsctables, table, utils
 from pycbc.inject import InjectionSet, legacy_approximant_name
 from pycbc.types import TimeSeries
 from pycbc.waveform import get_td_waveform

bin/minifollowups/pycbc_sngl_minifollowup

@@ -19,8 +19,8 @@
 import os, sys, argparse, logging, h5py, datetime
 import numpy
 from lal import GPSToUTC
-from pycbc.ligolw import lsctables, table
-from pycbc.ligolw import utils as ligolw_utils
+from glue.ligolw import lsctables, table
+from glue.ligolw import utils as ligolw_utils
 from pycbc.results import layout
 from pycbc.events import select_segments_by_definer
 import pycbc.workflow.minifollowups as mini
@@ -128,7 +128,7 @@ trigs = hdf.SingleDetTriggers(args.single_detector_file, args.bank_file,
                               None, args.instrument)
 
 if args.non_coinc_time_only:
-    from pycbc.ligolw.ligolw import LIGOLWContentHandler as h
+    from glue.ligolw.ligolw import LIGOLWContentHandler as h
     lsctables.use_in(h)
     segs_doc = ligolw_utils.load_filename(args.inspiral_segments,
                                           contenthandler=h)

bin/pycbc_banksim

@@ -20,9 +20,9 @@ import sys
 import logging
 from numpy import complex64, float32, array
 from argparse import ArgumentParser
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw import table, lsctables
-from pycbc.ligolw.ligolw import LIGOLWContentHandler
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw import table, lsctables
+from glue.ligolw.ligolw import LIGOLWContentHandler
 class mycontenthandler(LIGOLWContentHandler):
     pass
 lsctables.use_in(mycontenthandler)

bin/pycbc_banksim_match_combine

@@ -27,7 +27,7 @@ import imp
 import argparse
 import numpy
 import h5py
-from pycbc.ligolw import utils, table
+from glue.ligolw import utils, table
 import pycbc
 from pycbc import pnutils
 from pycbc.waveform import TemplateBank
@@ -37,8 +37,8 @@ __version__ = pycbc.version.git_verbose_msg
 __date__    = pycbc.version.date
 __program__ = "pycbc_banksim_match_combine"
 
-from pycbc.ligolw.ligolw import LIGOLWContentHandler
-from pycbc.ligolw import lsctables
+from glue.ligolw.ligolw import LIGOLWContentHandler
+from glue.ligolw import lsctables
 class mycontenthandler(LIGOLWContentHandler):
     pass
 lsctables.use_in(mycontenthandler)

bin/pycbc_banksim_skymax

@@ -20,9 +20,9 @@ import sys
 import logging
 from numpy import complex64, float32, sqrt, argmax, real, array
 from argparse import ArgumentParser
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw import table, lsctables
-from pycbc.ligolw.ligolw import LIGOLWContentHandler
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw import table, lsctables
+from glue.ligolw.ligolw import LIGOLWContentHandler
 class mycontenthandler(LIGOLWContentHandler):
     pass
 lsctables.use_in(mycontenthandler)

bin/pycbc_coinc_time

@@ -24,8 +24,8 @@ def parse_veto_definer(veto_def_filename):
             Returns a dictionary first indexed by ifo, then category level, and
             finally a list of veto definitions.
     """
-    from pycbc.ligolw import ligolw, table, lsctables, utils as ligolw_utils
-    from pycbc.ligolw.ligolw import LIGOLWContentHandler as h
+    from glue.ligolw import ligolw, table, lsctables, utils as ligolw_utils
+    from glue.ligolw.ligolw import LIGOLWContentHandler as h
     lsctables.use_in(h)
 
     indoc = ligolw_utils.load_filename(veto_def_filename, False, contenthandler=h)

bin/pycbc_create_injections

@@ -123,7 +123,7 @@ from pycbc.workflow import WorkflowConfigParser
 import h5py
 
 # stuff for writing xml files... remove this when we drop xml
-from pycbc.ligolw import ligolw, lsctables, table, utils as ligolw_utils
+from glue.ligolw import ligolw, lsctables, table, utils as ligolw_utils
 
 class LIGOLWContentHandler(ligolw.LIGOLWContentHandler):
     pass

bin/pycbc_dark_vs_bright_injections

@@ -34,8 +34,8 @@ import numpy
 import pycbc
 import pycbc.inject
 import pycbc.tmpltbank.em_progenitors
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw import lsctables
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw import lsctables
 from random import sample
 from copy import deepcopy
 

bin/pycbc_faithsim

@@ -26,8 +26,8 @@ import sys
 import logging
 from numpy import loadtxt,complex64,float32
 import argparse
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw import table, lsctables, ligolw
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw import table, lsctables, ligolw
 
 import pycbc.version
 import pycbc.strain

bin/pycbc_get_ffinal

@@ -13,10 +13,10 @@ import optparse
 
 from pycbc import waveform
 
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw import table
-from pycbc.ligolw.utils import process
+from glue.ligolw import lsctables
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw import table
+from glue.ligolw.utils import process
 
 def fstr(input):
     """

bin/pycbc_inj_cut

@@ -31,9 +31,9 @@ import logging
 import numpy
 import pycbc
 import pycbc.inject
-from pycbc.ligolw import utils as ligolw_utils
+from glue.ligolw import utils as ligolw_utils
 from pycbc.types import MultiDetOptionAction
-from pycbc.ligolw import lsctables
+from glue.ligolw import lsctables
 import pycbc.version
 
 parser = argparse.ArgumentParser(description=__doc__)

bin/pycbc_make_banksim

@@ -91,13 +91,13 @@ def mkdir(dir_name):
         pass
 
 def mc_min_max_from_sorted_file(fname):
-    from pycbc.ligolw import lsctables
-    from pycbc.ligolw.ligolw import LIGOLWContentHandler
+    from glue.ligolw import lsctables
+    from glue.ligolw.ligolw import LIGOLWContentHandler
     class mycontenthandler(LIGOLWContentHandler):
         pass
     lsctables.use_in(mycontenthandler)
-    from pycbc.ligolw.utils import load_filename
-    from pycbc.ligolw.table import get_table
+    from glue.ligolw.utils import load_filename
+    from glue.ligolw.table import get_table
     from pycbc.pnutils import mass1_mass2_to_mchirp_eta
     try:
         t = get_table(load_filename(fname, False, contenthandler=mycontenthandler), "sngl_inspiral")
@@ -291,11 +291,11 @@ f = open("scripts/pycbc_banksim_collect_results", "w")
 f.write("""#!/usr/bin/env python
 from os.path import isfile
 from numpy import *
-from pycbc.ligolw import utils, table
+from glue.ligolw import utils, table
 import glob
 
-from pycbc.ligolw.ligolw import LIGOLWContentHandler
-from pycbc.ligolw import lsctables
+from glue.ligolw.ligolw import LIGOLWContentHandler
+from glue.ligolw import lsctables
 class mycontenthandler(LIGOLWContentHandler):
     pass
 lsctables.use_in(mycontenthandler)

bin/pycbc_make_faithsim

@@ -146,7 +146,7 @@ f = open("scripts/pycbc_faithsim_collect_results", "w")
 f.write("""#!/usr/bin/env python
 from os.path import isfile
 from numpy import *
-from pycbc.ligolw import utils, table, lsctables, ligolw
+from glue.ligolw import utils, table, lsctables, ligolw
 import glob
 
 class ContentHandler(ligolw.LIGOLWContentHandler):
@@ -220,7 +220,7 @@ import matplotlib.cm
 import pylab
 from os.path import isfile
 from numpy import *
-from pycbc.ligolw import utils, table, lsctables
+from glue.ligolw import utils, table, lsctables
 from matplotlib.ticker import MultipleLocator, FormatStrFormatter
 import glob
 

bin/pycbc_optimal_snr

@@ -29,11 +29,11 @@ import h5py
 import pycbc
 import pycbc.inject
 import pycbc.psd
-from pycbc.ligolw import utils as ligolw_utils
+from glue.ligolw import utils as ligolw_utils
 from pycbc.filter import sigma, make_frequency_series
 from pycbc.types import TimeSeries, FrequencySeries, zeros, float32, \
                         MultiDetOptionAction, load_frequencyseries
-from pycbc.ligolw import lsctables
+from glue.ligolw import lsctables
 import pycbc.version
 
 

bin/pycbc_randomize_inj_dist_by_optsnr

@@ -10,11 +10,11 @@ import time
 from scipy import stats, special
 from argparse import ArgumentParser
 
-from pycbc.ligolw import ligolw
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw import table
-from pycbc.ligolw.utils import process
+from glue.ligolw import ligolw
+from glue.ligolw import lsctables
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw import table
+from glue.ligolw.utils import process
 
 def r_uniform_in_volume(r1, r2, N):
     xi = numpy.random.uniform(0., 1., size=N)

bin/pycbc_split_inspinj

@@ -3,8 +3,8 @@
 # Copyright (C) 2014 Andrew Lundgren
 import sys
 import argparse
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw import ligolw, lsctables
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw import ligolw, lsctables
 from itertools import cycle
 import pycbc.version
 

bin/pycbc_splitbank

@@ -38,11 +38,11 @@ __program__ = "pycbc_splitbank"
 import time
 import argparse
 from glue import gpstime
-from pycbc.ligolw import ligolw
-from pycbc.ligolw import table
-from pycbc.ligolw import lsctables
-from pycbc.ligolw import utils as ligolw_utils
-from pycbc.ligolw.utils import process as ligolw_process
+from glue.ligolw import ligolw
+from glue.ligolw import table
+from glue.ligolw import lsctables
+from glue.ligolw import utils as ligolw_utils
+from glue.ligolw.utils import process as ligolw_process
 from pycbc import version
 from numpy import random, ceil