Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[MNT] - Name update for new version #205

Merged
merged 67 commits into from
Sep 23, 2023
Merged
Changes from 1 commit
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
cd24360
name updates: sweep comments
TomDonoghue Apr 15, 2021
912e4a7
name update: fooof_obj -> model_obj
TomDonoghue Apr 15, 2021
c147a97
name update: fooofed_spectrum_ -> modeled_spectrum
TomDonoghue Apr 15, 2021
9fedefc
name update: data objs
TomDonoghue Apr 15, 2021
e1d365c
name update: object util funcs
TomDonoghue Apr 15, 2021
6c21a54
name update: custom error names
TomDonoghue Apr 15, 2021
fbc904e
bumb version for breaking change
TomDonoghue Apr 16, 2021
4d04f3f
name update: get_fooof -> get_model
TomDonoghue Apr 16, 2021
55dd13d
name updates: sweep on notes, IO, and utils
TomDonoghue Apr 16, 2021
4f0d7bf
name updates: move away from fm & fg in module
TomDonoghue Apr 16, 2021
bcd4ea9
name update: FOOOFGroup -> PSDGroup
TomDonoghue Apr 16, 2021
a3e4e13
name update: FOOOF object -> PSD
TomDonoghue Apr 16, 2021
df907da
name update: rename module
TomDonoghue Apr 16, 2021
bf4883d
Naming: update README descriptions
TomDonoghue Apr 16, 2021
051d306
lints & minor docstring updates
TomDonoghue Apr 16, 2021
3dcd52d
name update: update tutorials
TomDonoghue Apr 16, 2021
9317163
name update: update examples
TomDonoghue Apr 17, 2021
173085d
name update: motivations
TomDonoghue Apr 17, 2021
5099f03
name update: update doc site files
TomDonoghue Apr 17, 2021
04c8af1
naming: update API list
TomDonoghue Apr 17, 2021
7212313
name update: update FAQ for name, and quick edits
TomDonoghue Apr 17, 2021
76d3f5b
merge from main
TomDonoghue May 5, 2021
169ae8e
fix group naming
TomDonoghue May 5, 2021
ab1288f
clean up tests - drop explicit save_fig
TomDonoghue May 10, 2021
aca28b6
update preprint links to pubs
TomDonoghue May 10, 2021
8178d15
merge annot update
TomDonoghue May 10, 2021
be68d60
fix annot update
TomDonoghue May 10, 2021
1aad0ac
actually fix annot upate
TomDonoghue May 10, 2021
d9d34de
update sim name to sim_*
TomDonoghue May 10, 2021
32c0d2f
update docs for sim name update
TomDonoghue May 10, 2021
cf56d7c
various docsite updates & fixes
TomDonoghue May 10, 2021
50ad870
update file names
TomDonoghue May 20, 2021
08b7eec
update name in root files
TomDonoghue May 27, 2021
5bcfdfe
fix merge
TomDonoghue Jun 29, 2023
043c0a4
fix pytest import
TomDonoghue Jun 29, 2023
14ef825
fix sim doctests
TomDonoghue Jun 29, 2023
4eac4c5
update module name in workflow file
TomDonoghue Jun 29, 2023
42d457f
fix doctest for subsample spectra
TomDonoghue Jun 29, 2023
eb23f2f
fix merge
TomDonoghue Jun 30, 2023
b1d89fc
fix merge
TomDonoghue Jun 30, 2023
f09be73
merge lints
TomDonoghue Jun 30, 2023
c4655ef
update object names to SpectralModel
TomDonoghue Jun 30, 2023
8a7980e
fix merge new PRs
TomDonoghue Jun 30, 2023
a125aff
fix merge main for version number
TomDonoghue Jun 30, 2023
3434702
fix merge for other language readme info
TomDonoghue Jun 30, 2023
798de66
fix merge of rst fixes, etc
TomDonoghue Jun 30, 2023
b4953ed
update version number to rc0
TomDonoghue Jun 30, 2023
9fa8dc8
fix merge
TomDonoghue Jul 8, 2023
3930fd2
fix reference to fooof in group object
TomDonoghue Jul 8, 2023
92794ab
merge 1.1
TomDonoghue Jul 22, 2023
00d112f
update merges for 2.0
TomDonoghue Jul 22, 2023
901c9b1
fix doctest from merge
TomDonoghue Jul 22, 2023
bd01b61
merge udpates from 1.1 doc updates
TomDonoghue Jul 22, 2023
9fd116c
merge 1.1 init updates
TomDonoghue Jul 22, 2023
d33a0ff
fix dev demo import
TomDonoghue Jul 22, 2023
23f3d57
fix merge
TomDonoghue Jul 25, 2023
7f2bca4
fix / update to ModelRunModes
TomDonoghue Jul 25, 2023
a08e1bd
fix merge
TomDonoghue Aug 3, 2023
9824829
fix merge (for real)
TomDonoghue Aug 3, 2023
9702942
fix get data
TomDonoghue Aug 3, 2023
a1a946a
Merge branch 'main' into name
TomDonoghue Aug 3, 2023
3db3559
merge new version number
TomDonoghue Aug 3, 2023
da5d53a
merge optimize branch
TomDonoghue Sep 13, 2023
c0019a2
fix jacobians test import
TomDonoghue Sep 13, 2023
4a1ca34
fix merge
TomDonoghue Sep 13, 2023
9d854fd
fix merge
TomDonoghue Sep 13, 2023
313fb23
replace version
TomDonoghue Sep 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix / update to ModelRunModes
  • Loading branch information
TomDonoghue committed Jul 25, 2023
commit 7f2bca4391470fcf48b7790d5668b9b91536c0b5
4 changes: 2 additions & 2 deletions specparam/data/conversions.py
Original file line number Diff line number Diff line change
@@ -90,8 +90,8 @@ def group_to_dict(fit_results, peak_org):

Parameters
----------
fit_results : list of FOOOFResults
List of FOOOFResults objects.
fit_results : list of FitResults
List of FitResults objects.
peak_org : int or Bands
How to organize peaks.
If int, extracts the first n peaks.
4 changes: 2 additions & 2 deletions specparam/objs/fit.py
Original file line number Diff line number Diff line change
@@ -575,11 +575,11 @@ def get_run_modes(self):

Returns
-------
FOOOFRunModes
ModelRunModes
Object containing the run modes from the current object.
"""

return FOOOFRunModes(**{key.strip('_') : getattr(self, key) \
return ModelRunModes(**{key.strip('_') : getattr(self, key) \
for key in OBJ_DESC['run_modes']})