diff --git a/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py b/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py index 8df1d6a7590059220b9cf14d34fb17dc137ffc10..c3a69455ae4e96b5da4ac34daad03b1b86d7fb4c 100644 --- a/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py +++ b/BayesWaveUtils/bayeswave_pipe/bayeswave_pipe_utils.py @@ -156,19 +156,6 @@ def hyphen_range(s): else: # more than one hyphen raise ValueError('format error in %s' % x) -def read_injection_table(filename): - - xmldoc = ligolw_utils.load_filename(filename, contenthandler = - LIGOLWContentHandler, verbose = True) - - sim_inspiral_table = lsctables.SimInspiralTable.get_table(xmldoc) - - return ( sim_inspiral_table.get_column('geocent_end_time') + \ - 1e-9*sim_inspiral_table.get_column('geocent_end_time') ) - - - - class eventTrigger: """ @@ -473,8 +460,13 @@ class triggerList: LIGOLWContentHandler, verbose = True) sim_inspiral_table = lsctables.SimInspiralTable.get_table(xmldoc) - injection_times = sim_inspiral_table.get_column('geocent_end_time') + \ - 1e-9*sim_inspiral_table.get_column('geocent_end_time_ns') + geocent_end_time = \ + sim_inspiral_table.getColumnByName('geocent_end_time') + geocent_end_time_ns = \ + sim_inspiral_table.getColumnByName('geocent_end_time_ns') + + injection_times = geocent_end_time.asarray() + \ + 1e-9*geocent_end_time_ns.asarray() print("..read %d injections"%len(injection_times))