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.

Sign up for GitHub

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

Jump to bottom

Rachael docs #1

Merged
merged 151 commits into from
Mar 6, 2020
Merged

Rachael docs #1

merged 151 commits into from
Mar 6, 2020

Conversation

smoia
Copy link

@smoia smoia commented Mar 6, 2020 •
edited
Loading

Proposed Changes

  • Tutorial!
  • And an update on upstream/master

smoia and others added 30 commits January 11, 2020 18:32
Corrected setup options
b296dce
@eurunuela
Merge branch 'master' of https://github.com/physiopy/phys2bids into a…
2b65c09 
…dd/logger
@eurunuela
Added logger
5947f2f
@eurunuela
Added new dependency for logger. Made some bug fixes
96026fc
@eurunuela
Merge branch 'master' of https://github.com/physiopy/phys2bids into a…
0fef5af 
…dd/logger
@vinferrer
correct assert channel row
22dfb24
@vinferrer
deleting testing files since now they download automaticly
a27cba5
@vinferrer
now files are downloaded directly from osf.io
253f08f
@vinferrer
eliminate file that is already downloaded from osf.io
0727c0f
@vinferrer
now labchart files without time channel can be processed
e3e63e1
@vinferrer
add wget for the test
5c77298
@vinferrer
adding unit test for labchart file without time
20947fb
@eurunuela
Merge branch 'master' of https://github.com/physiopy/phys2bids into a…
b0cd28c 
…dd/logger
@eurunuela
Added more logger statements
32b738e
@eurunuela
Edited test to make them pass
ff5beb3
@vinferrer
Merge branch 'master' of https://github.com/physiopy/phys2bids into l…
7a08c9c 
…abchart_no_time
@vinferrer
adding logo from master
afb6e69
@vinferrer
add comments to the if statements
01722e0
@vinferrer
add comments to the url
9347b98
@vinferrer
linting problems solved
03312ee
@eurunuela
Update phys2bids/interfaces/txt.py
b9536cc 
Co-Authored-By: Stefano Moia <s.moia@bcbl.eu>
@eurunuela
Update phys2bids/physio_obj.py
dcbed72 
Co-Authored-By: Stefano Moia <s.moia@bcbl.eu>
@eurunuela
Update phys2bids/physio_obj.py
aeb4cc4 
Co-Authored-By: Stefano Moia <s.moia@bcbl.eu>
@eurunuela
Assess PR review comments and fix linting errors
e7cf602
@eurunuela
Removed logger error to make tests work
4678730
@eurunuela
Merge remote-tracking branch 'origin/add/logger' into add/logger
2506039
@eurunuela
Fixes all the mess I had created locally
ec0a7fe
@vinferrer
change -chplot help so it says that the full path is needed
b8fcf49
@eurunuela
Fixes typos
08e5778
@vinferrer
change url after adding file without time to OSF
4f1e4fa
smoia and others added 27 commits March 2, 2020 17:57
Correcting information message after logger
0ff56a3
Make the info stick out
e022a61
Modified test to keep the track of the changes
8983a0e
Merge pull request physiopy#154 from smoia/fix/outputdir
356ddde 
Change order of output folder existence check and creation before logger init
Merge pull request physiopy#156 from smoia/fix/channelnames
20fc77e 
Stop reordering trigger
@vinferrer
merge with upstream master
554aaa3
@vinferrer
solve while loop problem
aa387a8
@vinferrer @eurunuela
Update phys2bids/interfaces/txt.py
c00889b 
Co-Authored-By: Eneko Uruñuela <13706448+eurunuela@users.noreply.github.com>
@vinferrer
change comment
7aa29dc
@vinferrer
Merge branch 'multifreq' of github.com:vinferrer/phys2bids into multi…
f377338 
…freq
@vinferrer
Merge pull request physiopy#150 from vinferrer/multifreq
76b51b2 
Multifreq
Merge branch 'master' of github.com:physiopy/phys2bids into Rachael-docs
e4a3c87
Expanded documentation, corrected some typos, added an heuristic file…
1091e43 
… for the tutorial
Merge branch 'Rachael-docs' of github.com:RayStick/phys2bids into Rac…
1f98d16 
…hael-docs
Finished the tutorial, corrected minor typo
a9c769c
Added static figures
d3b8c65
typo correction
e28020d
@vinferrer
change for loop so it doesn't crash
4918a88
@vinferrer
now the for loop separates channels by frequency properly, I added a …
d695ecc 
…counter that stops the idx of breaking the code
@vinferrer
add comments to the loop
bbaa3d8
@vinferrer
solve linting problems
3885697
@vinferrer
Merge pull request physiopy#164 from vinferrer/bug_mfreq
a138451 
fix frequency separation
Added tutorial on how to set up heuristic files, some word rephrase i…
79433fd 
…n the howto, typos corrections and linting improvements.
@eurunuela
Main function now receives inputs without parser
7da5921
@eurunuela
Merge pull request physiopy#165 from eurunuela/enh/main
8aa8e35 
Adjusts main function for easier testing and usage of phys2bids from inside python
Update DOI, add links and citation
a0af86d
Merge branch 'master' of https://github.com/physiopy/phys2bids into R…
842cc78 
…achael-docs

Conflicts:
	phys2bids/phys2bids.py
@RayStick RayStick merged commit 8ef2b6e into RayStick:Rachael-docs Mar 6, 2020
RayStick pushed a commit that referenced this pull request Apr 16, 2020
@AyyagariA
Merge pull request #1 from BrightMG/AA
0d59dda 
Overhaul of best practices
RayStick pushed a commit that referenced this pull request May 14, 2020
Merge pull request #1 from RayStick/int/setup
496b45b 
Int/setup
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@smoia @RayStick @eurunuela @vinferrer