Commit 87f2a0e0 authored by Kipp Cannon's avatar Kipp Cannon

lalburst: rename ligolw_burca --> burca

Original: 44690e36580a0b4bf85baeb3ed4dcef37f062824
parent 4554a3c3
......@@ -36,7 +36,7 @@ from glue.ligolw import lsctables
from glue.ligolw import utils
from glue.ligolw.utils import process as ligolw_process
from lalburst import git_version
from lalburst import ligolw_burca
from lalburst import burca
from pylal import snglcoinc
......@@ -235,23 +235,23 @@ if options.coinc_segs is not None:
if options.coincidence_algorithm == "excesspower":
EventListType = ligolw_burca.ExcessPowerEventList
comparefunc = ligolw_burca.ExcessPowerCoincCompare
EventListType = burca.ExcessPowerEventList
comparefunc = burca.ExcessPowerCoincCompare
if options.coinc_segs is not None:
ntuple_comparefunc = coinc_segs_ntuple_comparefunc
else:
ntuple_comparefunc = lambda *args: False # keep everything
CoincTables = ligolw_burca.ExcessPowerCoincTables
CoincDef = ligolw_burca.ExcessPowerBBCoincDef
CoincTables = burca.ExcessPowerCoincTables
CoincDef = burca.ExcessPowerBBCoincDef
elif options.coincidence_algorithm == "stringcusp":
EventListType = ligolw_burca.StringEventList
comparefunc = ligolw_burca.StringCoincCompare
EventListType = burca.StringEventList
comparefunc = burca.StringCoincCompare
if options.coinc_segs is not None:
ntuple_comparefunc = lambda *args: coinc_segs_ntuple_comparefunc(*args) or ligolw_burca.StringNTupleCoincCompare(*args)
ntuple_comparefunc = lambda *args: coinc_segs_ntuple_comparefunc(*args) or burca.StringNTupleCoincCompare(*args)
else:
ntuple_comparefunc = ligolw_burca.StringNTupleCoincCompare
CoincTables = ligolw_burca.StringCuspCoincTables
CoincDef = ligolw_burca.StringCuspBBCoincDef
ntuple_comparefunc = burca.StringNTupleCoincCompare
CoincTables = burca.StringCuspCoincTables
CoincDef = burca.StringCuspBBCoincDef
else:
raise Exception("should never get here")
......@@ -275,7 +275,7 @@ for n, filename in enumerate(filenames):
# Have we already processed it?
#
if ligolw_process.doc_includes_process(xmldoc, ligolw_burca.process_program_name):
if ligolw_process.doc_includes_process(xmldoc, burca.process_program_name):
if options.verbose:
print >>sys.stderr, "warning: %s already processed," % (filename or "stdin"),
if not options.force:
......@@ -289,13 +289,13 @@ for n, filename in enumerate(filenames):
# Add an entry to the process table.
#
process = ligolw_burca.append_process(xmldoc, **options.__dict__)
process = burca.append_process(xmldoc, **options.__dict__)
#
# Run coincidence algorithm.
#
ligolw_burca.ligolw_burca(
burca.burca(
xmldoc = xmldoc,
process_id = process.process_id,
EventListType = EventListType,
......
......@@ -14,10 +14,10 @@ pymodule_PYTHON = \
__init__.py \
binjfind.py \
bucluster.py \
burca.py \
cafe.py \
date.py \
git_version.py \
ligolw_burca.py \
ligolw_burca2.py \
ligolw_burca_tailor.py \
packing.py \
......
......@@ -48,7 +48,7 @@ from glue.ligolw.utils import process as ligolw_process
from glue.ligolw.utils import search_summary as ligolw_search_summary
from glue.ligolw.utils import time_slide as ligolw_time_slide
from . import git_version
from . import ligolw_burca
from . import burca
from . import SimBurstUtils
......@@ -602,8 +602,8 @@ def binjfind(xmldoc, process, search, snglcomparefunc, nearcoinccomparefunc, ver
print >>sys.stderr, "indexing ..."
b_b_def = {
"StringCusp": ligolw_burca.StringCuspBBCoincDef,
"excesspower": ligolw_burca.ExcessPowerBBCoincDef,
"StringCusp": burca.StringCuspBBCoincDef,
"excesspower": burca.ExcessPowerBBCoincDef,
"waveburst": CWBBBCoincDef,
"omega": OmegaBBCoincDef
}[search]
......
......@@ -67,7 +67,7 @@ lsctables.SnglBurst.__cmp__ = sngl_burst___cmp__
#
process_program_name = "ligolw_burca"
process_program_name = "lalapps_burca"
def append_process(xmldoc, comment = None, **kwargs):
......@@ -342,7 +342,7 @@ def StringNTupleCoincCompare(events, offset_vector):
#
def ligolw_burca(
def burca(
xmldoc,
process_id,
EventListType,
......
......@@ -260,9 +260,9 @@ class StringCoincParamsDistributions(snglcoinc.CoincParamsDistributions):
orig_peak_times[event] = event.peak
# parse the --thresholds H1,L1=... command-line options from burca
delta_t = [float(threshold.split("=")[-1]) for threshold in ligolw_process.get_process_params(database.xmldoc, "ligolw_burca", "--thresholds")]
delta_t = [float(threshold.split("=")[-1]) for threshold in ligolw_process.get_process_params(database.xmldoc, "lalapps_burca", "--thresholds")]
if not all(delta_t[0] == threshold for threshold in delta_t[1:]):
raise ValueError("\Delta t is not unique in ligolw_burca arguments")
raise ValueError("\Delta t is not unique in lalapps_burca arguments")
delta_t = delta_t.pop()
# construct the coinc generator. note that H1+H2-only
......
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