Commit a1cb32b8 authored by Vivien Raymond's avatar Vivien Raymond

Fixes segment selection in lalinference_pipe_utils when using bayeswave

parent 7924c03b
......@@ -1315,7 +1315,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
else:
slide=0
for seg in self.segments[ifo]:
if segstart >= seg.start() and segend < seg.end():
if segstart >= seg.start() and segend <= seg.end():
if not self.config.has_option('lalinference','fake-cache'):
if self.config.has_option('condor','bayesline') or self.config.has_option('condor','computeroqweights'):
prenode.add_ifo_data(ifo,seg,self.channels[ifo],timeslide=slide)
......@@ -1410,7 +1410,7 @@ class LALInferencePipelineDAG(pipeline.CondorDAG):
else:
slide=0
for seg in self.segments[ifo]:
if segstart >= seg.start() and segend < seg.end():
if segstart >= seg.start() and segend <= seg.end():
if not self.config.has_option('lalinference','fake-cache'):
bayeswavepsdnode[ifo].add_ifo_data(ifo,seg,self.channels[ifo],timeslide=slide)
else:
......
......@@ -211,8 +211,8 @@ for sampler in samps:
cp.set('paths','roq_b_matrix_directory',thispath)
flow=roq_params[roq]['flow'] / roq_mass_freq_scale_factor
srate=2.*roq_params[roq]['fhigh'] / roq_mass_freq_scale_factor
if srate > 8192:
srate = 8192
if srate > 8192:
srate = 8192
seglen=roq_params[roq]['seglen'] * roq_mass_freq_scale_factor
# params.dat uses the convention q>1 so our q_min is the inverse of their qmax
......
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