Commit cb6f83f6 authored by Adam Mercer's avatar Adam Mercer
Browse files

Merge branch 'lalapps_string_final_bug_fix' into 'master'

bug fix: argumernts of nlargest() was mistakenly reversed

See merge request !165
parents 090769b0 eeffba34
Pipeline #14134 failed with stages
in 150 minutes and 4 seconds
......@@ -202,9 +202,9 @@ class RateVsThreshold(object):
def __iadd__(self, other):
self.zero_lag += other.zero_lag
self.n_background += other.n_background
self.background[:] = heapq.nlargest(itertools.chain(self.background, other.background), self.record_background)
self.most_significant_background[:] = heapq.nlargest(itertools.chain(self.most_significant_background, other.most_significant_background), self.record_candidates)
self.candidates[:] = heapq.nlargest(itertools.chain(self.candidates, other.candidates), self.record_candidates)
self.background[:] = heapq.nlargest(self.record_background, itertools.chain(self.background, other.background))
self.most_significant_background[:] = heapq.nlargest(self.record_candidates, itertools.chain(self.most_significant_background, other.most_significant_background))
self.candidates[:] = heapq.nlargest(self.record_candidates, itertools.chain(self.candidates, other.candidates))
self.zero_lag_time += other.zero_lag_time
self.background_time += other.background_time
return self
......@@ -545,8 +545,8 @@ class Efficiency(object):
self.seglists |= other.seglists
self.vetoseglists |= other.vetoseglists
self.found += other.found
self.loudest_missed[:] = heapq.nlargest(itertools.chain(self.loudest_missed, other.loudest_missed), self.n_diagnostics)
self.quietest_found[:] = heapq.nlargest(itertools.chain(self.quietest_found, other.quietest_found), self.n_diagnostics)
self.loudest_missed[:] = heapq.nlargest(self.n_diagnostics, itertools.chain(self.loudest_missed, other.loudest_missed))
self.quietest_found[:] = heapq.nlargest(self.n_diagnostics, itertools.chain(self.quietest_found, other.quietest_found))
self.all += other.all
return self
......
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