Merge branch 'main' into checkmodes

TomDonoghue · TomDonoghue · commit 9415bee327ff · 2023-07-23T20:03:10.000-04:00
diff --git a/fooof/objs/__init__.py b/fooof/objs/__init__.py
@@ -2,4 +2,4 @@
 
 from .fit import FOOOF
 from .group import FOOOFGroup
-from .utils import compare_info, average_fg, combine_fooofs, fit_fooof_3d
+from .utils import compare_info, average_fg, average_reconstructions, combine_fooofs, fit_fooof_3d
diff --git a/fooof/utils/__init__.py b/fooof/utils/__init__.py
@@ -1,3 +1,3 @@
 """Utilities sub-module for FOOOF."""
 
-from .data import trim_spectrum, interpolate_spectrum, subsample_spectra
+from .data import trim_spectrum, interpolate_spectrum, interpolate_spectra, subsample_spectra

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`"""Utilities sub-module for FOOOF."""`
`2`	`2`
`3`		`-from .data import trim_spectrum, interpolate_spectrum, subsample_spectra`
	`3`	`+from .data import trim_spectrum, interpolate_spectrum, interpolate_spectra, subsample_spectra`