move data object to data

Author: TomDonoghue

specparam/objs/data.py renamed to specparam/data/data.py

@@ -4,7 +4,7 @@
 
 from specparam.models import SpectralModel, SpectralTimeModel
 from specparam.objs.results import Results3D
-from specparam.objs.data import Data3D
+from specparam.data.data import Data3D
 from specparam.plts.event import plot_event_model
 from specparam.data.conversions import event_group_to_dataframe, dict_to_df
 from specparam.data.utils import flatten_results_dict

specparam/models/event.py

@@ -8,7 +8,7 @@
 import numpy as np
 
 from specparam.models import SpectralModel
-from specparam.objs.data import Data2D
+from specparam.data.data import Data2D
 from specparam.objs.results import Results2D
 from specparam.objs.utils import run_parallel_group, pbar
 from specparam.plts.group import plot_group_model

specparam/models/group.py

@@ -8,7 +8,7 @@
 import numpy as np
 
 from specparam.models.base import BaseModel
-from specparam.objs.data import Data
+from specparam.data.data import Data
 from specparam.objs.results import Results
 from specparam.algorithms.spectral_fit import SpectralFitAlgorithm, SPECTRAL_FIT_SETTINGS_DEF
 from specparam.reports.save import save_model_report

specparam/models/model.py

@@ -2,7 +2,7 @@
 
 from specparam.models import SpectralModel, SpectralGroupModel
 from specparam.objs.results import Results2DT
-from specparam.objs.data import Data2DT
+from specparam.data.data import Data2DT
 from specparam.data.conversions import group_to_dataframe, dict_to_df
 from specparam.data.utils import get_results_by_ind
 from specparam.io.models import save_time

specparam/models/time.py

@@ -1,7 +1,7 @@
 """Tests for specparam.algorthms.spectral_fit."""
 
 from specparam.models.base import BaseModel
-from specparam.objs.data import Data
+from specparam.data.data import Data
 from specparam.objs.results import Results
 from specparam.sim import sim_power_spectrum
 from specparam.algorithms.algorithm import Algorithm

specparam/tests/algorithms/test_spectral_fit.py

@@ -1,10 +1,10 @@
-"""Tests for specparam.objs.data."""
+"""Tests for specparam.data.data."""
 
 from specparam.data import SpectrumMetaData, ModelChecks
 
 from specparam.tests.tutils import plot_test
 
-from specparam.objs.data import *
+from specparam.data.data import *
 
 ###################################################################################################
 ###################################################################################################

specparam/tests/objs/test_data.py renamed to specparam/tests/data/test_data.py

@@ -4,10 +4,10 @@
 
 from specparam.bands import Bands
 from specparam.modes.modes import Modes
+from specparam.data.data import Data, Data2D
 from specparam.data.stores import FitResults
 from specparam.models import (SpectralModel, SpectralGroupModel,
                               SpectralTimeModel, SpectralTimeEventModel)
-from specparam.objs.data import Data, Data2D
 from specparam.sim.params import param_sampler
 from specparam.sim.sim import sim_power_spectrum, sim_group_power_spectra, sim_spectrogram