lints

Author: TomDonoghue

specparam/core/io.py

@@ -224,15 +224,15 @@ def save_event(event, file_name, file_path=None, append=False,
 
     fg = event.get_group(None, None, 'group')
     if save_settings and not save_results and not save_data:
-        fg.save(file_name, file_path, save_settings=True)
+        fg.save(file_name, file_path, append=append, save_settings=True)
     else:
         ndigits = len(str(len(event)))
         for ind, gres in enumerate(event.event_group_results):
             fg.group_results = gres
             if save_data:
                 fg.power_spectra = event.spectrograms[ind, :, :].T
             fg.save(file_name + '_{:0{ndigits}d}'.format(ind, ndigits=ndigits),
-                    file_path=file_path, save_results=save_results,
+                    file_path=file_path, append=append, save_results=save_results,
                     save_settings=save_settings, save_data=save_data)
 
 

specparam/objs/event.py

@@ -7,6 +7,7 @@
 import numpy as np
 
 from specparam.objs import SpectralModel, SpectralTimeModel
+from specparam.objs.group import _progress
 from specparam.plts.event import plot_event_model
 from specparam.data.conversions import event_group_to_dict, event_group_to_dataframe, dict_to_df
 from specparam.data.utils import get_group_params, get_results_by_row, flatten_results_dict
@@ -92,14 +93,14 @@ def _reset_event_results(self, length=0):
     def has_data(self):
         """Redefine has_data marker to reflect the spectrograms attribute."""
 
-        return True if np.any(self.spectrograms) else False
+        return bool(np.any(self.spectrograms))
 
 
     @property
     def has_model(self):
         """Redefine has_model marker to reflect the event results."""
 
-        return True if self.event_group_results else False
+        return bool(self.event_group_results)
 
 
     @property
@@ -112,14 +113,14 @@ def n_peaks_(self):
 
     @property
     def n_events(self):
-        # ToDo: double check if we want this - I think is never used internally?
+        """How many events are included in the model object."""
 
         return len(self)
 
 
     @property
     def n_time_windows(self):
-        # ToDo: double check if we want this - I think is never used internally?
+        """How many time windows are included in the model object."""
 
         return self.spectrograms[0].shape[1] if self.has_data else 0
 
@@ -226,7 +227,7 @@ def fit(self, freqs=None, spectrograms=None, freq_range=None, peak_org=None,
         """
 
         # ToDo: here because of circular import - updates / refactors should fix & move
-        from specparam.objs.group import _progress
+        #from specparam.objs.group import _progress
 
         if spectrograms is not None:
             self.add_data(freqs, spectrograms, freq_range)
@@ -360,7 +361,8 @@ def get_group(self, event_inds, window_inds, output_type='event'):
                 # Add results for specified power spectra - event group results
                 temp = [self.event_group_results[ei][wi] for ei in einds for wi in winds]
                 step = int(len(temp) / len(einds))
-                output.event_group_results = [temp[ind:ind+step] for ind in range(0, len(temp), step)]
+                output.event_group_results = \
+                    [temp[ind:ind+step] for ind in range(0, len(temp), step)]
 
                 # Add results for specified power spectra - event time results
                 output.event_time_results = \

specparam/sim/params.py

@@ -150,7 +150,7 @@ def _check_values(start, stop, step):
             raise ValueError("Inputs 'start' and 'stop' should be positive values.")
 
         if (stop - start) * step < 0:
-            raise ValueError("The sign of input 'step' does not align with 'start' / 'stop' values.")
+            raise ValueError("The sign of 'step' does not align with 'start' / 'stop' values.")
 
         if start == stop:
             raise ValueError("Input 'start' and 'stop' must be different values.")