-
Notifications
You must be signed in to change notification settings - Fork 45
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
Add the possibility to split multi-run physiological recordings #206
Merged
Merged
Changes from 183 commits
Commits
Show all changes
210 commits
Select commit
Hold shift + click to select a range
88f12a1
[ENHANC] intializing split utility
sangfrois ee685c2
[ENHANC] adding elements of the plan
sangfrois 3215022
ephemeral issue_36.md added in root for planif. Linter Revisions
sangfrois e494d3e
updating step two, specified ways2integrate PR and possible names
sangfrois cd0c0a9
fixed typos and syntax error
sangfrois 1d3c45b
Merge branch 'master' of https://github.com/physiopy/phys2bids into s…
sangfrois 7759012
fixed typos and updated 2nd part of plan
sangfrois 1168258
Add trig_idx as BlueprintInput attribute
e1b7e37
General reordering, comments and corrections
0ff1b24
Merge pull request #2 from smoia/enh/split4phys
sangfrois 5610ec9
Finish adding trig_idx attribute
232dea9
implementing comments from stefano - corrections
sangfrois ba8b233
trimming and detailed comments
sangfrois de4e8f6
trimming and detailed comments - additions
sangfrois 80c43f2
lintering
sangfrois c454c68
Merge remote-tracking branch 'sangfrois/split_utility' into enh/split…
3165b4d
Add start index to dictionary making it a dictionary of tuples
b13daea
typos and error raising
sangfrois 66b15c2
define exceptions
sangfrois cbe40d0
Merge branch 'split_utility' of github.com:sangfrois/phys2bids into e…
6d449f5
opting for indexes by updating object in loop
sangfrois 22677cb
redefining plan and minor fixes in split
sangfrois 872038f
Merge branch 'master' of https://github.com/physiopy/phys2bids into s…
sangfrois 3e6880c
fixing rendering in md
sangfrois ce0d1ed
fixing rendering in md
sangfrois 9f00c4b
fixing rendering in md
sangfrois 817f100
reverting to previous split2phys
sangfrois a7de9fb
Merge remote-tracking branch 'sangfrois/split_utility' into enh/split…
d30f419
Add comments and structure of if statements to call split function
c04f227
Merge pull request #3 from smoia/enh/split4phys
sangfrois 84fca59
erase duplicate in split, regorg phys2bids, changes types in CLI
sangfrois e512921
updating
sangfrois e49f554
updating
sangfrois 4356fab
adding smoia changes
sangfrois f8d9863
adjusting split and main workflow to smoia changes
sangfrois d6e3e1e
reformatting run definition with indexes
sangfrois 80546a1
renaming function
sangfrois 4754d50
merging smoia changes and restruc multirun sec in phys2bids
sangfrois 6d445ae
adding plot for runs
sangfrois 885708d
Merge branch 'master' of https://github.com/physiopy/phys2bids into s…
sangfrois 5198840
lintering
sangfrois d7fd362
minor comment
sangfrois 1bf7905
Reorganising some code
e535845
Adding back info stop
c018571
Change dictionary loop
ff0d992
Correct dictionary enumeration
bfe07a2
Code review
422b4d1
removing parralel workflow
sangfrois 45d27b7
comments and doc string
sangfrois 2420294
linter and multi-run section
sangfrois 67248e6
merge conflicts
sangfrois 0b21fad
changing argument name for chtrig
sangfrois 632d404
merging smoia improvements
sangfrois 16e8598
redefining first run_start - is not idx 0
sangfrois 3fd4241
Merge branch 'master' of https://github.com/physiopy/phys2bids into s…
sangfrois 09bda51
using where method to find values in array
sangfrois 11e7ba4
Revert "removing parralel workflow"
689cf2c
Delete alternative workflow CLI
ef6657b
Add chtrig in BlueprintInput initialisation
b2cc386
Add split4phys and ones import
9e0798e
Move comments to right place
deb5c93
Init new function
7c7ddb4
ob2split
sangfrois 1d81d5b
Merge remote-tracking branch 'sangfrois/split_utility' into enh/split…
350581c
Remove duplicate info
e1faeaa
last changes
sangfrois d1abe50
Merge pull request #6 from smoia/enh/split4phys
sangfrois fb9bea2
Update after gitpod
d5aa6da
Marked function parts
dad2b7f
Merge remote-tracking branch 'sangfrois/split_utility' into enh/split…
83dbc29
Solve merge
a6f4904
Merge pull request #7 from smoia/enh/split4phys
sangfrois da63d39
redefining run_start for padding problem + comments
sangfrois a7a60a0
redefining run_start for padding problem - last commit is comment
sangfrois 9961afd
end_index definition and general reformatting
sangfrois 876df71
initializing main function that will return sliced obj
sangfrois ad281d1
renaming function and outputs so it's more intuitive
sangfrois c169e14
renaming file also
sangfrois be278af
iterate through timestamps dict, slice and overwrite attributes
sangfrois 7f62879
restructuring docstring and function order
sangfrois c6377a7
minimizing repetition in phys2bids for viz.plot_trigger
sangfrois 966c593
Add comments and some suggestions
b386f67
Correct function import in main workflow
51fb2ce
Merge pull request #8 from smoia/enh/split4phys
sangfrois 07f98e7
fixing conflicts
sangfrois c474ab0
reorder slice4phys
sangfrois 31fa00c
viz.save_plot docstring and comment its use in main workflow
sangfrois bda8edf
implementing smoia comments - run counter
sangfrois ad16b5a
make sure phys_in update in find_runs dont extend to next run
sangfrois 55d956c
minor fixes in comments/doctsrings and lintering
sangfrois c80fd9b
minor change to docstring
sangfrois e1128ed
minor fix in docstring
sangfrois 91459e2
slice4phys - adding arguments in docstrings
sangfrois 02b097d
slice4phys - adding notes in docstrings
sangfrois 50afdb4
slice4phys - adding notes in docstrings
sangfrois e102c81
some more docstring info
sangfrois 7ba1593
Merge branch 'master' of https://github.com/physiopy/phys2bids into s…
sangfrois 0f8a919
initializing change in docs for split
sangfrois 44d9f5b
Merge remote-tracking branch 'upstream/master' into enh/split4phys
6b26e58
merging conflict in phys2bids module import
sangfrois 35a6eea
changing type in cli for -ntp, -tr - list doesn't work
sangfrois bfdb07c
adding microsiemens for eda
sangfrois 2229c1c
changing argumets for check_trigger, slice4phys
sangfrois b6fbb05
adding argument and changing run_end definition
sangfrois 5742434
Merge remote-tracking branch 'sangfrois/split_utility' into enh/split…
3c43e52
Merge remote-tracking branch 'upstream/master' into enh/split4phys
a21196c
Reorder imports
b736b03
Following general style
32db15b
Convert dict keys to number for easier integration
37a8724
Transform phys_in in dictionary for multirun support, adapt phys_out …
11cbfd7
Add filename property to BlueprintOutput class
e3e6fad
Add output filename as object property
0c17117
Add run as an optional variable in use_heuristic
e6be352
Rename bids_unit.py as bids.py
6310cf1
Move use_heuristic from phys2bids.py to bids.py
5240241
Adapt call to use_heuristic for possible multirun and multifreq
90681a4
Avoid overwriting
1a2d1b9
Change warning
d687147
Pass the run information to heuristics
6a35b3b
minor changes for troubleshooting multirun workflow
sangfrois e98eb91
Merge remote-tracking branch 'sangfrois/split_utility' into enh/split…
66fe785
Make run_idx human readable in print and in dictionary. Reformat docs…
fc39899
Change " into '
9aa8706
Flake the docstring
4ddf4fe
Solve a merge conflict, more 'flaking' for docstrings
a41efe2
Add ### comment
e40ae20
More ### comment and remove nonexistent defaults
1a8469b
More ### comments
aa5f687
Change viz.save_plot call loop for readability, also more ### comments
baee891
More ### comments, add defaults and parameters.
733098f
Deal with slices like [:i] and [i:], more ### comments
8d6db53
Merge remote-tracking branch 'upstream/master' into enh/split4phys
d0cca22
Merge branch 'master' of https://github.com/physiopy/phys2bids into s…
sangfrois d807cb3
Merge branch 'enh/split4phys' of https://github.com/smoia/phys2bids i…
sangfrois dd7eaa5
applying changes from smoia comments
sangfrois 83de39c
adding statement to deal with single channel rec fo viz
sangfrois 1770fc5
reverting some changes made for testing
sangfrois 3e411d8
changing filename with run
sangfrois 96b80f0
reverting filename
sangfrois 6d9d8b1
reverting filename
sangfrois a897c15
documentation
sangfrois 8953278
adding logger info and improve readability of run
sangfrois 12341c2
erasing print for tests, idx.start still not working
sangfrois a1200e4
uncommenting section
sangfrois 06af0a8
linting
sangfrois 09ed5d9
adding last element to docs
sangfrois e4d72b6
linting on phys2bids
sangfrois 6d73743
changing -ntp and -tr types for integration
sangfrois 5916cdd
fixing types and error for CI
sangfrois 6183d19
changing types for integration
sangfrois 0a700d0
fixing integration errors
sangfrois 9fa664c
reverting phys2bids test arguments
sangfrois 6da16df
changing run_amount definition
sangfrois e146162
Update phys2bids/bids.py
2a29ac6
Update phys2bids/phys2bids.py
0b98410
Update phys2bids/phys2bids.py
9c01088
Update phys2bids/phys2bids.py
8ad2ba9
Update phys2bids/phys2bids.py
52964d4
Update phys2bids/phys2bids.py
7901296
Update phys2bids/viz.py
75b01db
Update phys2bids/viz.py
0542863
Update phys2bids/viz.py
2c9a9f8
Update phys2bids/phys2bids.py
sangfrois bd14f6c
Update phys2bids/phys2bids.py
sangfrois 13df1c5
Update phys2bids/tests/test_integration.py
sangfrois f0917a1
Fix multirun errors
rmarkello 2e65f28
Fixes final multifreq error
rmarkello 4a14d93
Add padding as optional argument, correct split4phys call
1f178bd
Revert "Add filename property to BlueprintOutput class"
a0b68f8
Add filename to docstring
0c6cca7
Use import numpy as np syntax
rmarkello 67b7a86
Correct documentation and short rephrasing
32a84cf
Update phys2bids/phys2bids.py
sangfrois 366e2e8
Update phys2bids/cli/run.py
sangfrois 3a86684
Update docs/howto.rst
1e3d9b1
Make things personal
be52689
Update docs/howto.rst
6396e67
Check tr ntp length earlier
80554b8
Bug fix on threshold entry
d2d2e97
Run keys start from 1
8e61577
Change plot filename
dd94f83
Merge remote-tracking branch 'sangfrois/split_utility' into enh/split…
4178b8a
Correct plot printing
68508fa
Moving back run_amount
3cdaf2c
Update pytest to make travis work
8858fed
Correct fileprefix name
01b5975
Deepcopy the object, then run again check_trigger_amount
6885cdc
Merge branch 'master' of github.com:physiopy/phys2bids into enh/split…
d7c5bd2
redef of run start
sangfrois 174d4de
Add tr in test call
187f262
fix paddings
1c88981
Linter
cc7bacf
empty commit
sangfrois 68a77da
Merge remote-tracking branch 'upstream/master' into enh/split4phys
ec3bc0d
Fix paths
dff0b14
Merge branch 'master' into enh/split4phys
c62a1be
Adapt use_heuristic call to new heuristic call, remove unused library
5da8f09
Add "run" as argument in new heuristic
797401f
Format filename frequency as integer
4595150
Format frequency as integer for heuristic
747e9bb
Optimise run_amount
30e3f14
Optimise metadata creation
c379fc7
Fix paths
c59c40b
Fix log name
5aedebb
Rename multifreq files as {freq}Hz
4d2d15d
Adapt names
aaf8624
Lint
bf943eb
Force pip to skip release candidates
4694d4d
Force pip to skip release candidates
2d56fd3
Force pip to skip matplotlib 3.3.0rc1
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -125,3 +125,4 @@ dmypy.json | |
.pyre/ | ||
|
||
.vscode/ | ||
phys2bids/tests/data/* |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What about something like
'Padding between multi-run session files (in seconds). Default is 9 seconds.'
?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm not in love with this suggestion, for one main reason. This argument sets the amount of recording you have before or after a run, no matter how much time is there between runs (i.e. you might end up having part of an earlier run into this file, if you set enough padding). If you formulate it like the "between runs in a multi-run session", then it looks like you're asking the user how much time they recorded in between - which is a different concept.