Commit 914fd2b6 authored by Kipp Cannon's avatar Kipp Cannon
Browse files

thinca: remove cruft from API

parent 2cdcf6f0
......@@ -76,7 +76,6 @@ def parse_command_line():
parser.add_option("-t", "--threshold", metavar = "float", type = "float", help = "Set the coincidence threshold (required). The meaning is defined by the match algorithm. For --match=exact this sets the Delta t window in seconds.")
parser.add_option("--min-instruments", metavar = "number", default = "2", type = "int", help = "Set the minimum number of instruments that must participate in a coincidence (default = 2). The value must be greater than 0.")
parser.add_option("--vetoes-name", metavar = "string", default = "vetoes", help = "From the input document, exatract the segment list having this name to use as the veto segments (default = \"vetoes\"). Warning: if no segments by this name are found in the document then vetoes will not be applied, this is not an error condition.")
parser.add_option("--trigger-program", metavar = "name", default = "inspiral", help = "Set the name of the program that generated the event list as it appears in the process table (default = \"inspiral\"). This is used to identify the search_summary table entries to be used to define instrument on and off times.")
parser.add_option("--coinc-end-time-segment", metavar = "seg", help = "The segment of time to retain coincident triggers from. Uses segmentUtils.from_range_strings() format \"START:END\" for an interval of the form [START,END), \"START:\" for an interval of the form [START,INF), and \":END\" for an interval of the form (-INF,END).")
parser.add_option("-v", "--verbose", action = "store_true", help = "Be verbose.")
options, filenames = parser.parse_args()
......@@ -238,7 +237,6 @@ for n, filename in enumerate(filenames, start = 1):
thresholds = options.threshold,
ntuple_comparefunc = ntuple_comparefunc,
veto_segments = vetoes,
trigger_program = options.trigger_program,
min_instruments = options.min_instruments,
verbose = options.verbose
)
......
......@@ -110,7 +110,7 @@ InspiralCoincDef = lsctables.CoincDef(search = u"inspiral", search_coinc_type =
class InspiralCoincTables(snglcoinc.CoincTables):
def __init__(self, xmldoc, vetoes = None, program = u"inspiral", likelihood_func = None, likelihood_params_func = None):
def __init__(self, xmldoc, likelihood_func = None, likelihood_params_func = None):
snglcoinc.CoincTables.__init__(self, xmldoc)
#
......@@ -347,7 +347,6 @@ def ligolw_thinca(
thresholds,
ntuple_comparefunc = InspiralCoincTables.ntuple_comparefunc,
veto_segments = None,
trigger_program = u"inspiral",
likelihood_func = None,
likelihood_params_func = None,
min_instruments = 2,
......@@ -369,7 +368,7 @@ def ligolw_thinca(
if verbose:
print("indexing ...", file=sys.stderr)
coinc_tables = InspiralCoincTables(xmldoc, vetoes = veto_segments, program = trigger_program, likelihood_func = likelihood_func, likelihood_params_func = likelihood_params_func)
coinc_tables = InspiralCoincTables(xmldoc, likelihood_func = likelihood_func, likelihood_params_func = likelihood_params_func)
coinc_def_id = ligolw_coincs.get_coinc_def_id(xmldoc, coinc_definer_row.search, coinc_definer_row.search_coinc_type, create_new = True, description = coinc_definer_row.description)
instruments = set(coinc_tables.time_slide_table.getColumnByName("instrument"))
......
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