PR161 + review - #163
Conversation
Conflicts: aa_recipes_and_parametersets/aap_parameters_defaults_CBSU.xml
…input in place of ROIfile setting for greater flexibility, update MTI example
…ive SPM paths, tidy up dirs
…r for more portable scripts
1. aarecipe now creates a new seed aap_parameters_user.xml file if no defaults file is specified. This put user-specific configuration outside of version control (where it should be). 2. The example scripts all call aarecipe without a defaults file, so that the above functionality makes it possible to run tests regardless of site (as long as the data is publicly available). 3. aa_test/aatest - new test function for running tests on the above examples in an automated manner. 4. Re-organised the examples directory for clarity and to make it possible to run particular test flavours (e.g., all CBU-specific tests are under the cbu folder). Added light-weight documentation for this. 5. Big tidy up of legacy examples. 6. Relocated the task lists to the examples directory, and renamed to always match the user script it goes with. Renamed aa_recipes_and_parametersets aa_parametersets to reflect this change (this directory only contains defaults now).
|
I do the same (demo and BIDS) here, at the RHUL. |
|
All went well on my end. |
|
aa_user_diffusion crashes for me during aamod_diffusion_rois_dartel_denormDKI. I am a little stumped here. regstreams is defined as inptstreams(1:end-3), which means it is what? Then we iterate over that and drop any where aas_stream_hascontents returns zero. And we end up with nothing. I don't really understand what this code is trying to achieve. Can you reproduce the error? I think it's something to do with the ROI input stream. |
|
I have found the issue and debugged it. Try again, please! |
|
Thanks, that seems to have done the trick. |
|
Shall we merge, then? |
|
Still running through the tests. I accidentally tested the wrong version so having to rerun a few things.. Stay tuned. |
|
Thanks for the informative discussion! :)
…On Mon, Sep 3, 2018 at 3:35 AM Johan Carlin ***@***.***> wrote:
Still running through the tests. I accidentally tested the wrong version
so having to rerun a few things.. Stay tuned.
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#163 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAGtPY5HnAScQ6-jrIaVOunEUQiwQ9QGks5uXOnUgaJpZM4WB5Ca>
.
|
|
Now we crash on aa_user_freesurfer (old aa_user_FS), which is trying to define subjects with a 1-argument approach and crashes on undefined varargin{2}. Do we still support this call syntax? Maybe we need to set directory_conventions.
|
|
I have updated the example script. |
|
aa_init lines 77-79:
This code worked fine for us under previous versions of Matlab. Under R2018a, it crashes on line 79. This feels like a typo. On the other hand, it's related to fieldtrip initialization and we don't use fieldtrip. |
|
Are you sure it is the MATLAB version? I am using 2018a in multiple places without issue. |
|
I'll doublecheck (might be a mac/linux thing) For my own understanding, what does line 79 |
|
But why clear it? |
|
To remove previous (potentially conflicting) settings (e.g. from another version of SPM) |
|
Update: Ok, today it is not crashing. If it starts crashing again, I will update. |
|
Ok, I have managed to get through the test suite. Merging... |
|
I pushed one more commit (cc2e390) to the repo - turns out my shell expansion method only works in bash, and the rest of CBU is on tcsh. All fixed now. Sorry not to do another pull request, but this was a hot fix - AA was basically broken for all non-bash users. |
This PR contains @jooh's PR (#161), plus the commits of its review. I have tested it both at the RHUL and at the CBSU.
The main modifications are:
If @jooh and others agree, then this PR can be merged instead of #161.
(I am sorry for the confusion! I am sure there must be a more elegant way, but PR to @jooh's repo did not work, because some of my commits were not detected).