From a85b0eae831ad4e55a8dee0450b34760228980ac Mon Sep 17 00:00:00 2001 From: Iara Ota Date: Mon, 9 Sep 2024 16:19:04 -0500 Subject: [PATCH] fix process state prints --- gwsumm/tabs/data.py | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/gwsumm/tabs/data.py b/gwsumm/tabs/data.py index a040ec21..3df3e88b 100644 --- a/gwsumm/tabs/data.py +++ b/gwsumm/tabs/data.py @@ -338,8 +338,9 @@ def finalize_states(self, config=ConfigParser(), segdb_error='raise', for state in self.states: state.fetch(config=config, segdb_error=segdb_error, **kwargs) # finilize statebar - if self.statebar: - self.statebar.fetch(config=config, segdb_error=segdb_error, **kwargs) + if self.statebar is not None: + self.statebar.fetch(config=config, segdb_error=segdb_error, + **kwargs) def process(self, config=ConfigParser(), nproc=1, **stateargs): @@ -365,12 +366,16 @@ def process(self, config=ConfigParser(), nproc=1, **stateargs): nproc=nproc, nds=stateargs.get('nds', None)) vprint(f"States finalised [{len(self.states) + len([self.statebar])}" " total]\n") - for state in self.states + [self.statebar]: + for state in self.states: vprint(f" {state.name}: {len(state.active)} segments" - " | {abs(state.active)} seconds") + f" | {abs(state.active)} seconds") if state is self.defaultstate: vprint(" [DEFAULT]") vprint('\n') + if self.statebar is not None: + vprint(f" {self.statebar.name}: {len(self.statebar.active)}" + f" segments | {abs(state.active)} seconds") + vprint('\n') # pre-process requests for 'all-data' plots all_data = any([(p.all_data & p.new) for p in self.plots])