diff --git a/gwsumm/archive.py b/gwsumm/archive.py index 10a3e841..c26ba980 100644 --- a/gwsumm/archive.py +++ b/gwsumm/archive.py @@ -338,6 +338,9 @@ def archive_table(table, key, parent): the h5py group in which to add this dataset """ + # copy table so we can modify meta without impacting anything + table = table.copy(copy_data=False) + if len(table) == 0: warnings.warn("%r table is empty and will not be archived" % key) return diff --git a/gwsumm/tabs/etg.py b/gwsumm/tabs/etg.py index 604c007c..4ea06417 100644 --- a/gwsumm/tabs/etg.py +++ b/gwsumm/tabs/etg.py @@ -187,20 +187,23 @@ def from_ini(cls, config, section, **kwargs): ] # override from config if config.has_option(section, 'loudest-columns'): - new.loudest['columns'] = map( + new.loudest['columns'] = list(map( lambda s: re_quote.sub('', s), - config.get(section, 'loudest-columns').split(',')) + config.get(section, 'loudest-columns').split(',') + )) if config.has_option(section, 'loudest-labels'): - new.loudest['labels'] = map( + new.loudest['labels'] = list(map( lambda s: re_quote.sub('', s), - config.get(section, 'loudest-labels').split(',')) + config.get(section, 'loudest-labels').split(',') + )) else: new.loudest['labels'] = [' '.join(map(str.title, s.split('_'))) for s in new.loudest['columns']] if config.has_option(section, 'loudest-rank'): - new.loudest['rank'] = map( + new.loudest['rank'] = list(map( lambda c: re_quote.sub('', c), - config.get(section, 'loudest-rank').split(',')) + config.get(section, 'loudest-rank').split(',') + )) if config.has_option(section, 'loudest-dt'): new.loudest['dt'] = config.getfloat(section, 'loudest-dt') else: diff --git a/gwsumm/tabs/sei.py b/gwsumm/tabs/sei.py index 4bc64986..4776b78e 100644 --- a/gwsumm/tabs/sei.py +++ b/gwsumm/tabs/sei.py @@ -30,8 +30,12 @@ import numpy +from MarkupPy import markup + from gwpy.time import Time +from gwdetchar.io import html as gwhtml + from .registry import (get_tab, register_tab) from .. import (globalv, html) from ..config import GWSummConfigParser @@ -297,7 +301,7 @@ def write_state_html(self, state): totals[i][j] = c # add row total totals[i][-1] = totals[i].sum() - page.th(totals[i][-1]) + page.th(str(totals[i][-1])) page.tr.close() page.tbody.close() @@ -306,8 +310,7 @@ def write_state_html(self, state): page.tr(class_='header') page.th('Totals') for i in range(totals.shape[1]): - t = totals[:, i].sum() - page.th(t) + page.th(str(totals[:, i].sum())) page.tr.close() page.thead.close() page.table.close() @@ -381,7 +384,7 @@ def write_state_html(self, state): rows[-1].append('
'.join(assoc)) else: rows[-1].append('-') - page.add(str(html.table( + page.add(str(gwhtml.table( headers, rows, caption=('List of %s watch-dog trips in interval [%d .. %d) - ' 'trips are considered \'associated\' if they fall within '