update merges for 2.0

Author: TomDonoghue

specparam/objs/utils.py

@@ -141,7 +141,7 @@ def average_reconstructions(group, avg_method='mean'):
 
     models = np.zeros(shape=group.power_spectra.shape)
     for ind in range(len(group)):
-        models[ind, :] = group.get_fooof(ind, regenerate=True).fooofed_spectrum_
+        models[ind, :] = group.get_model(ind, regenerate=True).modeled_spectrum_
 
     avg_model = avg_funcs[avg_method](models, 0)
 

specparam/tests/objs/test_fit.py

@@ -433,7 +433,7 @@ def test_check_data():
     tfm.fit()
     assert not tfm.has_model
 
-def test_fooof_to_df(tfm, tbands, skip_if_no_pandas):
+def test_to_df(tfm, tbands, skip_if_no_pandas):
 
     df1 = tfm.to_df(2)
     assert isinstance(df1, pd.Series)

specparam/tests/plts/test_model.py

@@ -28,9 +28,9 @@ def test_plot_model_custom(tfm, skip_if_no_mpl):
     # Make sure model has been fit - set custom frequency range
     tfm.fit(custom_freqs, custom_power_spectrum, freq_range=[5, 35])
 
-    plot_fm(tfm, freqs=custom_freqs, power_spectrum=custom_power_spectrum,
-            freq_range=[1, 55], save_fig=True, file_path=TEST_PLOTS_PATH,
-            file_name='test_plot_fm_custom.png')
+    plot_model(tfm, freqs=custom_freqs, power_spectrum=custom_power_spectrum,
+               freq_range=[1, 55], save_fig=True, file_path=TEST_PLOTS_PATH,
+               file_name='test_plot_fm_custom.png')
 
 @plot_test
 def test_plot_model_add_peaks(tfm, skip_if_no_mpl):

specparam/tests/utils/test_data.py

@@ -52,7 +52,7 @@ def test_interpolate_spectrum():
 
 def test_interpolate_spectra():
 
-    freqs, powers = gen_group_power_spectra(\
+    freqs, powers = sim_group_power_spectra(\
         5, [1, 150], [1, 100, 1], [[10, 0.5, 1.0], [60, 1, 0.1], [120, 0.5, 0.1]])
 
     exclude = [[58, 62], [118, 122]]

specparam/utils/data.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from fooof.core.modutils import docs_get_section, replace_docstring_sections
+from specparam.core.modutils import docs_get_section, replace_docstring_sections
 
 ###################################################################################################
 ###################################################################################################
@@ -178,7 +178,7 @@ def interpolate_spectra(freqs, powers, interp_range, buffer=3):
     --------
     Using simulated spectra, interpolate away line noise peaks:
 
-    >>> from fooof.sim import gen_group_power_spectra
+    >>> from specparam.sim import gen_group_power_spectra
     >>> freqs, powers = gen_group_power_spectra(5, [1, 75], [1, 1], [[10, 0.5, 1.0], [60, 2, 0.1]])
     >>> freqs, powers = interpolate_spectra(freqs, powers, [58, 62])
     """

specparam/utils/download.py

@@ -5,7 +5,7 @@
 
 import numpy as np
 
-from fooof.core.io import fpath
+from specparam.core.io import fpath
 
 ###################################################################################################
 ###################################################################################################