Skip to content

Commit 539930e

Browse files
authored
Merge pull request #2519 from effigies/cleanup
Minor cleanups
2 parents ab3ea2d + 15274fb commit 539930e

File tree

3 files changed

+18
-18
lines changed

3 files changed

+18
-18
lines changed

doc/devel/testing_nipype.rst

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ environment variable is not set, some FreeSurfer related tests will fail.
5454
If any of the tests failed, please report them on our `bug tracker
5555
<http://github.com/nipy/nipype/issues>`_.
5656

57-
On Debian systems with a local copy of MATLAB installed, set the following
57+
On Debian systems with a local copy of MATLAB installed, set the following
5858
environment variable before running tests::
5959

6060
export MATLABCMD=$pathtomatlabdir/bin/$platform/MATLAB
@@ -74,8 +74,8 @@ A few tests in Nipype make use of some images distributed within the `FSL course
7474
<http://fsl.fmrib.ox.ac.uk/fslcourse/>`_. This reduced version of the package can be downloaded `here
7575
<https://files.osf.io/v1/resources/nefdp/providers/osfstorage/57f472cf9ad5a101f977ecfe>`_.
7676
To enable the tests depending on these data, just unpack the targz file and set the :code:`FSL_COURSE_DATA` environment
77-
variable to point to that folder.
78-
Note, that the test execution time can increase significantly with these additional tests.
77+
variable to point to that folder.
78+
Note, that the test execution time can increase significantly with these additional tests.
7979

8080

8181
Xfailed tests
@@ -87,14 +87,14 @@ Some tests are expect to fail until the code will be changed or for other reason
8787
Testing Nipype using Docker
8888
---------------------------
8989

90-
Nipype is tested inside Docker containers and users can use nipype images to test local versions.
90+
Nipype is tested inside Docker containers and users can use nipype images to test local versions.
9191
First, install the `Docker Engine <https://docs.docker.com/engine/installation/>`_.
9292
Nipype has one base docker image called nipype/nipype:base, that contains several useful tools
9393
(FreeSurfer, AFNI, FSL, ANTs, etc.), and additional test images
9494
for specific Python versions: py27 for Python 2.7 and py36 for Python 3.6.
9595

9696
Users can pull the nipype image for Python 3.6 as follows::
97-
97+
9898
docker pull nipype/nipype:py36
9999

100100
In order to test a local version of nipype you can run test within container as follows::
@@ -105,5 +105,5 @@ In order to test a local version of nipype you can run test within container as
105105
Additional comments
106106
-------------------
107107

108-
If the project is tested both on your local OS and within a Docker container, you might have to remove all
108+
If the project is tested both on your local OS and within a Docker container, you might have to remove all
109109
``__pycache__`` directories before switching between your OS and a container.

nipype/interfaces/afni/preprocess.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2423,19 +2423,19 @@ class TProjectInputSpec(AFNICommandInputSpec):
24232423
exists=True)
24242424
censortr = traits.List(
24252425
traits.Str(),
2426-
desc="""list of strings that specify time indexes
2426+
desc="""list of strings that specify time indexes
24272427
to be removed from the analysis. Each string is
2428-
of one of the following forms:
2429-
37 => remove global time index #37
2430-
2:37 => remove time index #37 in run #2
2431-
37..47 => remove global time indexes #37-47
2432-
37-47 => same as above
2433-
2:37..47 => remove time indexes #37-47 in run #2
2434-
*:0-2 => remove time indexes #0-2 in all runs
2435-
+Time indexes within each run start at 0.
2436-
+Run indexes start at 1 (just be to confusing).
2437-
+N.B.: 2:37,47 means index #37 in run #2 and
2438-
global time index 47; it does NOT mean
2428+
of one of the following forms:
2429+
37 => remove global time index #37
2430+
2:37 => remove time index #37 in run #2
2431+
37..47 => remove global time indexes #37-47
2432+
37-47 => same as above
2433+
2:37..47 => remove time indexes #37-47 in run #2
2434+
*:0-2 => remove time indexes #0-2 in all runs
2435+
+Time indexes within each run start at 0.
2436+
+Run indexes start at 1 (just be to confusing).
2437+
+N.B.: 2:37,47 means index #37 in run #2 and
2438+
global time index 47; it does NOT mean
24392439
index #37 in run #2 AND index #47 in run #2.""",
24402440
argstr="-CENSORTR %s")
24412441
cenmode = traits.Enum(

0 commit comments

Comments
 (0)