Skip to content

Conversation

@Remi-Gau
Copy link
Contributor

@Remi-Gau Remi-Gau commented Nov 1, 2019

Opening a PR to make sure that all the tests will pass and prepare for merging.

Remi-Gau and others added 30 commits October 1, 2019 11:03
This reverts commit 01e95eb.
change model.Steps(iStep) to model.Steps{iStep}
- Contrasts are computed for every event in each run.
- Model.json files contains the information for computing the contrasts 
(autocontrasts) from the level:Run
This reverts commit 01e95eb.
change model.Steps(iStep) to model.Steps{iStep}
- Contrasts are computed for every event in each run.
- Model.json files contains the information for computing the contrasts 
(autocontrasts) from the level:Run
@Remi-Gau
Copy link
Contributor Author

Remi-Gau commented Nov 1, 2019

Main change added:

  • opt.derivativeDir is now opt.dataDir : the user specifies where the data is rather than where it should go. The data will then be copied in fullfile(opt.dataDir, '..', 'derivatives', 'SPM12_CPPL'). One of the many advantages is that the user does not need to put the data in fodler called raw

Minor changes:

  • fix bugs and crashes in octave
  • fix bugs, crashes, merge conflicts after merging with master
  • improve on copyRawFolder : uses getData on the raw directory to figure out what to copy, uses spm_select to find files to unzip, make it more human readable

@Remi-Gau
Copy link
Contributor Author

Remi-Gau commented Nov 1, 2019

OK I have tested this on a couple of data sets and it seems OK: this should be good for one final review. @mohmdrezk

most of the changes are in :

  • copyRawFolder
  • make4Dmaps

see also message above.

note to self: next time let's make smaller pull requests with fewer features in them and starting from a recent version of master.

@Remi-Gau Remi-Gau requested a review from mohmdrezk November 1, 2019 13:15
@Remi-Gau
Copy link
Contributor Author

Remi-Gau commented Nov 1, 2019

One thing I will do once this is merged is to double check how it runs on octave and docker

@Remi-Gau Remi-Gau merged commit 0dace15 into cpp-lln-lab:master Nov 3, 2019
@Remi-Gau Remi-Gau deleted the remi_constrast-specification branch November 3, 2019 16:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants