Skip to content

added SPM12's new Normalize routine and updated version info and manual links #986

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

Merged
merged 11 commits into from
Nov 5, 2014
Merged

added SPM12's new Normalize routine and updated version info and manual links #986

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
8a08941
SPM12 is not beta anymore
miykael Oct 31, 2014
9ee5775
Updated SPM manual links to current SPM12 manual
miykael Oct 31, 2014
0e1b497
added SPM12's new Normalize routine
miykael Nov 1, 2014
40d2869
added SPM12's new Normalize routine
miykael Nov 1, 2014
ab8f00c
corrections, pep8 check and test_auto_Normalize12.py
miykael Nov 1, 2014
33c7a77
Merge branch 'master' of https://github.com/miykael/nipype
miykael Nov 1, 2014
edf76cf
code duplicate deleted
miykael Nov 1, 2014
af51820
Merge remote-tracking branch 'upstream/master' into enh/spmnormalize
satra Nov 4, 2014
d3aed2b
fix: test fixes for spm and rename interface
satra Nov 4, 2014
356696a
updated CHANGES
miykael Nov 4, 2014
80034ac
Merge pull request #1 from satra/enh/spmnormalize
miykael Nov 4, 2014
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
Prev Previous commit
Next Next commit
corrections, pep8 check and test_auto_Normalize12.py
  • Loading branch information
@miykael
miykael committed Nov 1, 2014
commit ab8f00c90da85ba40242adb106b0a44801775eb9
9 changes: 4 additions & 5 deletions nipype/interfaces/spm/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,11 @@

from .base import (Info, SPMCommand, logger, no_spm, scans_for_fname,
scans_for_fnames)
from .preprocess import (SliceTiming, Realign, Coregister, Normalize, Normalize12,
Segment, Smooth, NewSegment, DARTEL, DARTELNorm2MNI,
CreateWarped, VBMSegment)
from .preprocess import (SliceTiming, Realign, Coregister, Normalize,
Normalize12, Segment, Smooth, NewSegment, DARTEL,
DARTELNorm2MNI, CreateWarped, VBMSegment)
from .model import (Level1Design, EstimateModel, EstimateContrast, Threshold,
OneSampleTTestDesign, TwoSampleTTestDesign,
PairedTTestDesign, MultipleRegressionDesign)
from .utils import (Analyze2nii, CalcCoregAffine, ApplyTransform, Reslice,
ApplyInverseDeformation,ResliceToReference,DicomImport)

ApplyInverseDeformation, ResliceToReference, DicomImport)
4 changes: 2 additions & 2 deletions nipype/interfaces/spm/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,7 +467,7 @@ def _make_matlab_command(self, contents, postscript=None):
fprintf('SPM path: %s\\n', which('spm'));
spm('Defaults','fMRI');

if strcmp(name, 'SPM8') || strcmp(name, 'SPM12'),
if strcmp(name, 'SPM8') || strcmp(name(1:5), 'SPM12'),
spm_jobman('initcfg');
spm_get_defaults('cmdline', 1);
end\n
Expand Down Expand Up @@ -502,7 +502,7 @@ def _make_matlab_command(self, contents, postscript=None):
"""
if self.inputs.use_mcr:
mscript += """
if strcmp(name, 'SPM8') || strcmp(name, 'SPM12'),
if strcmp(name, 'SPM8') || strcmp(name(1:5), 'SPM12'),
close(\'all\', \'force\');
end;
"""
Expand Down
Loading