Skip to content
Snippets Groups Projects
Commit e027ad1c authored by Kipp Cannon's avatar Kipp Cannon
Browse files

plotsummary: clean up / fix some seglist issues

- simplify segment list collection
- fix handling of unpopulated segment list types
parent a9732313
No related branches found
No related tags found
No related merge requests found
...@@ -262,12 +262,9 @@ class CoincDatabase(object): ...@@ -262,12 +262,9 @@ class CoincDatabase(object):
# get all the segments in the database to use as a summary # get all the segments in the database to use as a summary
for llwsegs in ligolw_segments.LigolwSegments(xmldoc).coalesce(): for llwsegs in ligolw_segments.LigolwSegments(xmldoc).coalesce():
for instrument in llwsegs.instruments: seglists = self.all_segs_dict.setdefault(llwsegs.name, segments.segmentlistdict())
# do the intersection in the loop to get a # FIXME: should be populating valid segments upstream
# new object each time to avoid confusion seglists |= segments.segmentlistdict.fromkeys(llwsegs.instruments, llwsegs.active) #& llwsegs.valid)
# from shared references
# FIXME: should be populating valid segments
self.all_segs_dict.setdefault(llwsegs.name, segments.segmentlistdict())[instrument] |= llwsegs.active #& llwsegs.valid
# get the live time # get the live time
if verbose: if verbose:
...@@ -1716,7 +1713,8 @@ class Segments(object): ...@@ -1716,7 +1713,8 @@ class Segments(object):
operator.ior(self.all_segs_dict.setdefault(name, segments.segmentlistdict()), seglists) operator.ior(self.all_segs_dict.setdefault(name, segments.segmentlistdict()), seglists)
def finish(self): def finish(self):
self.extent = segments.segmentlist(seglists.extent_all() for seglists in self.all_segs_dict.values()).extent() segs = reduce(segments.segmentlistdict.__or__, self.all_segs_dict.values(), segments.segmentlistdict())
self.extent = segs.extent_all()
for name, seglists in self.all_segs_dict.items(): for name, seglists in self.all_segs_dict.items():
for ifo, seglist in seglists.items(): for ifo, seglist in seglists.items():
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment