Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move to igwn-ligolw #5019

Draft
wants to merge 5 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bin/all_sky_search/pycbc_coinc_hdfinjfind
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ files.
"""

import argparse, logging, types, numpy, os.path
from ligo.lw import lsctables, utils as ligolw_utils
from igwn_ligolw import lsctables, utils as ligolw_utils
import igwn_segments as segments
import pycbc
from pycbc import events, init_logging
Expand Down
2 changes: 1 addition & 1 deletion bin/all_sky_search/pycbc_make_bayestar_skymap
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ import os
import glob
import tempfile

from ligo.lw import lsctables, utils as ligolw_utils
from igwn_ligolw import lsctables, utils as ligolw_utils

import pycbc
from pycbc.waveform import bank as wavebank
Expand Down
4 changes: 2 additions & 2 deletions bin/all_sky_search/pycbc_prepare_xml_for_gracedb
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ matplotlib.use('agg')

import lal
import lal.series
from ligo.lw import lsctables
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_segments import segment, segmentlist

import pycbc
Expand Down
2 changes: 1 addition & 1 deletion bin/all_sky_search/pycbc_sngls_pastro
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ coincidences.

import pycbc, pycbc.io, copy
import argparse, logging, numpy as np
from ligo.lw import lsctables, utils as ligolw_utils
from igwn_ligolw import lsctables, utils as ligolw_utils
from pycbc import conversions as conv
from pycbc.events import veto
from pycbc.io.ligolw import LIGOLWContentHandler
Expand Down
2 changes: 1 addition & 1 deletion bin/all_sky_search/pycbc_strip_injections
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import numpy, argparse, pycbc.pnutils, logging
from pycbc.events import veto
from pycbc.io.ligolw import LIGOLWContentHandler
from ligo.lw import ligolw, table, utils as ligolw_utils
from igwn_ligolw import ligolw, table, utils as ligolw_utils


effd = {"H1":"eff_dist_h", "L1":"eff_dist_l", "V1":"eff_dist_v"}
Expand Down
2 changes: 1 addition & 1 deletion bin/bank/pycbc_aligned_bank_cat
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import logging
import glob
import argparse
import numpy
from ligo.lw import utils
from igwn_ligolw import utils
from pycbc import tmpltbank
# Old ligolw output functions no longer imported at package level
import pycbc.tmpltbank.bank_output_utils as bank_output
Expand Down
2 changes: 1 addition & 1 deletion bin/bank/pycbc_bank_verification
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ import matplotlib
matplotlib.use('Agg')
import pylab

from ligo.lw import lsctables, utils as ligolw_utils
from igwn_ligolw import lsctables, utils as ligolw_utils

import pycbc
import pycbc.version
Expand Down
4 changes: 2 additions & 2 deletions bin/bank/pycbc_geom_aligned_bank
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@ import logging
import configparser
from scipy import spatial

from ligo.lw import ligolw
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import ligolw
from igwn_ligolw import utils as ligolw_utils

import pycbc
import pycbc.psd
Expand Down
2 changes: 1 addition & 1 deletion bin/bank/pycbc_tmpltbank_to_chi_params
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import argparse
import logging
import numpy

from ligo.lw import lsctables, utils as ligolw_utils
from igwn_ligolw import lsctables, utils as ligolw_utils

from pycbc import tmpltbank, psd, strain
from pycbc.io.ligolw import LIGOLWContentHandler
Expand Down
8 changes: 4 additions & 4 deletions bin/hwinj/pycbc_generate_hwinj
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,10 @@ import numpy
import os
import sys

from ligo.lw import ligolw
from ligo.lw import lsctables
from ligo.lw import table
from ligo.lw import utils
from igwn_ligolw import ligolw
from igwn_ligolw import lsctables
from igwn_ligolw import table
from igwn_ligolw import utils

import pycbc
import pycbc.version
Expand Down
4 changes: 2 additions & 2 deletions bin/minifollowups/pycbc_sngl_minifollowup
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import argparse
import logging
import numpy

from ligo.lw import table
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import table
from igwn_ligolw import utils as ligolw_utils

from pycbc import init_logging, add_common_pycbc_options
from pycbc.results import layout
Expand Down
2 changes: 1 addition & 1 deletion bin/plotting/pycbc_page_segments
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ def timestr(s):
return t

def get_name(segment_file):
from ligo.lw import table, utils as ligolw_utils
from igwn_ligolw import table, utils as ligolw_utils
from pycbc.io.ligolw import LIGOLWContentHandler

indoc = ligolw_utils.load_filename(
Expand Down
4 changes: 2 additions & 2 deletions bin/plotting/pycbc_page_vetotable
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ import logging
import numpy
import sys

from ligo.lw import lsctables
from ligo.lw import utils
from igwn_ligolw import lsctables
from igwn_ligolw import utils

import pycbc.results
from pycbc.results import save_fig_with_metadata
Expand Down
2 changes: 1 addition & 1 deletion bin/plotting/pycbc_plot_Nth_loudest_coinc_omicron.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
matplotlib.use('Agg')
import matplotlib.pyplot as plt

from ligo.lw import lsctables, utils
from igwn_ligolw import lsctables, utils

import pycbc.events
from pycbc.waveform import (
Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_banksim
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ from numpy import complex64, array
from argparse import ArgumentParser
from math import ceil, log

from ligo.lw import utils as ligolw_utils
from ligo.lw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw import lsctables

from pycbc.pnutils import mass1_mass2_to_mchirp_eta
from pycbc.pnutils import mass1_mass2_to_tau0_tau3
Expand Down
2 changes: 1 addition & 1 deletion bin/pycbc_banksim_match_combine
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bank files, and the number of injections in each must correspond one-to-one.
import argparse
import numpy as np

from ligo.lw import utils, table
from igwn_ligolw import utils, table

import pycbc
from pycbc import pnutils
Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_banksim_skymax
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ from argparse import ArgumentParser
from math import ceil, log
from tqdm import tqdm

from ligo.lw import utils as ligolw_utils
from ligo.lw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw import lsctables

from pycbc.pnutils import mass1_mass2_to_mchirp_eta
from pycbc.pnutils import nearest_larger_binary_number
Expand Down
2 changes: 1 addition & 1 deletion bin/pycbc_convertinjfiletohdf
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ from pycbc.io.record import FieldArray
from pycbc.io.hdf import HFile

from pycbc.io.ligolw import LIGOLWContentHandler
from ligo.lw import utils as ligolw_utils, lsctables
from igwn_ligolw import utils as ligolw_utils, lsctables


# Handlers for alternative injection formats
Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_faithsim
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ from numpy import complex64
import argparse
import sys

from ligo.lw import utils as ligolw_utils
from ligo.lw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw import lsctables

import pycbc.strain
import pycbc.psd
Expand Down
2 changes: 1 addition & 1 deletion bin/pycbc_faithsim_collect_results
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ computing the match between them and creating a .dat file with the results.
import argparse
import numpy as np

from ligo.lw import utils, lsctables
from igwn_ligolw import utils, lsctables

from pycbc import add_common_pycbc_options, init_logging
from pycbc.io.ligolw import LIGOLWContentHandler
Expand Down
6 changes: 3 additions & 3 deletions bin/pycbc_get_ffinal
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ import argparse
import pycbc
from pycbc import waveform

from ligo.lw import utils as ligolw_utils
from ligo.lw import table
from ligo.lw.utils import process
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw import table
from igwn_ligolw.utils import process

appx_options = waveform.td_approximants() + waveform.fd_approximants()

Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_inj_cut
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ import argparse
import logging
import numpy

from ligo.lw import utils as ligolw_utils
from ligo.lw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw import lsctables

import pycbc
import pycbc.inject
Expand Down
6 changes: 3 additions & 3 deletions bin/pycbc_make_banksim
Original file line number Diff line number Diff line change
Expand Up @@ -94,8 +94,8 @@ def mkdir(dir_name):
pass

def mc_min_max_from_sorted_file(fname):
from ligo.lw.utils import load_filename
from ligo.lw.table import Table
from igwn_ligolw.utils import load_filename
from igwn_ligolw.table import Table
from pycbc.pnutils import mass1_mass2_to_mchirp_eta
from pycbc.io.ligolw import LIGOLWContentHandler

Expand Down Expand Up @@ -303,7 +303,7 @@ f = open("scripts/pycbc_banksim_collect_results", "w")
f.write("""#!/usr/bin/env python
from os.path import isfile
from numpy import *
from ligo.lw import utils, table
from igwn_ligolw import utils, table
import glob

from pycbc.io.ligolw import LIGOLWContentHandler
Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_make_faithsim
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ dag.add_node(pnode)
f = open("scripts/pycbc_faithsim_collect_results", "w")
f.write("""#!/usr/bin/env python
from numpy import *
from ligo.lw import utils, table, lsctables
from igwn_ligolw import utils, table, lsctables
import glob
from pycbc.io.ligolw import LIGOLWContentHandler

Expand Down Expand Up @@ -218,7 +218,7 @@ matplotlib.use('Agg')
import matplotlib.cm
import pylab
from numpy import *
from ligo.lw import utils, table, lsctables
from igwn_ligolw import utils, table, lsctables
from matplotlib.ticker import MultipleLocator, FormatStrFormatter
import glob

Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_optimal_snr
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import argparse
import multiprocessing
import numpy as np

from ligo.lw import utils as ligolw_utils
from ligo.lw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw import lsctables

import pycbc
import pycbc.inject
Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_randomize_inj_dist_by_optsnr
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import time
from scipy import stats, special
from argparse import ArgumentParser

from ligo.lw import lsctables
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import lsctables
from igwn_ligolw import utils as ligolw_utils

import pycbc
from pycbc.io.ligolw import LIGOLWContentHandler
Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_split_inspinj
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# Copyright (C) 2014 Andrew Lundgren
import argparse
from ligo.lw import utils as ligolw_utils
from ligo.lw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw import lsctables
from itertools import cycle

import pycbc
Expand Down
6 changes: 3 additions & 3 deletions bin/pycbc_splitbank
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,9 @@
import argparse
from numpy import random, ceil

from ligo.lw import ligolw
from ligo.lw import lsctables
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import ligolw
from igwn_ligolw import lsctables
from igwn_ligolw import utils as ligolw_utils

import pycbc
from pycbc.io.ligolw import LIGOLWContentHandler, create_process_table
Expand Down
4 changes: 2 additions & 2 deletions bin/pycbc_upload_xml_to_gracedb
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ matplotlib.use('agg')
from ligo.gracedb.rest import GraceDb
import lal
import lal.series
from ligo.lw import lsctables
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import lsctables
from igwn_ligolw import utils as ligolw_utils
from igwn_segments import segment, segmentlist

import pycbc
Expand Down
4 changes: 2 additions & 2 deletions examples/live/check_results.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
import pycbc
from pycbc.io import FieldArray, HFile
from pycbc.io.ligolw import LIGOLWContentHandler
from ligo.lw.utils import load_filename as load_xml_doc
from ligo.lw import lsctables
from igwn_ligolw.utils import load_filename as load_xml_doc
from igwn_ligolw import lsctables
from pycbc import conversions as conv
from ligo.skymap.io import LigoLWEventSource

Expand Down
6 changes: 3 additions & 3 deletions examples/workflow/dayhopecheck/dayhopecheck.py
Original file line number Diff line number Diff line change
Expand Up @@ -49,9 +49,9 @@
import igwn_segments as segments
import pycbc.workflow as _workflow

from ligo.lw import ligolw
from ligo.lw import utils as ligolw_utils
from ligo.lw.utils import process as ligolw_process
from igwn_ligolw import ligolw
from igwn_ligolw import utils as ligolw_utils
from igwn_ligolw.utils import process as ligolw_process

from glue.segmentdb import segmentdb_utils

Expand Down
2 changes: 1 addition & 1 deletion pycbc/dq.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ def parse_veto_definer(veto_def_filename, ifos):
Returns a dictionary first indexed by ifo, then category level, and
finally a list of veto definitions.
"""
from ligo.lw import table, utils as ligolw_utils
from igwn_ligolw import table, utils as ligolw_utils
from pycbc.io.ligolw import LIGOLWContentHandler as h

data = {}
Expand Down
2 changes: 1 addition & 1 deletion pycbc/events/veto.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import logging
import numpy
from igwn_segments import segment, segmentlist
from ligo.lw import table, lsctables, utils as ligolw_utils
from igwn_ligolw import table, lsctables, utils as ligolw_utils

logger = logging.getLogger('pycbc.events.veto')

Expand Down
2 changes: 1 addition & 1 deletion pycbc/inject/inject.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
from abc import ABCMeta, abstractmethod

import lal
from ligo.lw import utils as ligolw_utils, ligolw, lsctables
from igwn_ligolw import utils as ligolw_utils, ligolw, lsctables

from pycbc import waveform, frame, libutils
from pycbc.opt import LimitedSizeDict
Expand Down
6 changes: 3 additions & 3 deletions pycbc/io/gracedb.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@
from multiprocessing.dummy import threading

import lal
from ligo.lw import ligolw
from ligo.lw import lsctables
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import ligolw
from igwn_ligolw import lsctables
from igwn_ligolw import utils as ligolw_utils

import pycbc
from pycbc import version as pycbc_version
Expand Down
6 changes: 3 additions & 3 deletions pycbc/io/hdf.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@
from io import BytesIO
from lal import LIGOTimeGPS

from ligo.lw import ligolw
from ligo.lw import lsctables
from ligo.lw import utils as ligolw_utils
from igwn_ligolw import ligolw
from igwn_ligolw import lsctables
from igwn_ligolw import utils as ligolw_utils

from pycbc.io.ligolw import (
return_search_summary,
Expand Down
Loading
Loading