Merge branch 'enh/activations-count-map' of github.com:oesteban/nipype into enh/activations-count-map

Author: oesteban

nipype/algorithms/stats.py

@@ -41,13 +41,11 @@ class ACM(SimpleInterface):
     output_spec = ACMOutputSpec
 
     def _run_interface(self, runtime):
-        allmaps = nb.concat_images(
-            [nb.load(f) for f in self.inputs.in_files]).get_data()
-        acm_pos = (allmaps > self.inputs.threshold).astype(
-            float).mean(3)
-        acm_neg = (allmaps < -1.0 * self.inputs.threshold).astype(
-            float).mean(3)
-
+        allmaps = nb.concat_images(self.inputs.in_files).get_data()
+        acm_pos = np.mean(allmaps > self.inputs.threshold,
+                          axis=3, dtype=np.float32)
+        acm_neg = np.mean(allmaps < -1.0 * self.inputs.threshold,
+                          axis=3, dtype=np.float32)
         acm_diff = acm_pos - acm_neg
 
         nii = nb.load(self.inputs.in_files[0])

nipype/algorithms/tests/test_auto_ACM.py

@@ -0,0 +1,31 @@
+# AUTO-GENERATED by tools/checkspecs.py - DO NOT EDIT
+from __future__ import unicode_literals
+from ..stats import ACM
+
+
+def test_ACM_inputs():
+    input_map = dict(
+        ignore_exception=dict(
+            deprecated='1.0.0',
+            nohash=True,
+            usedefault=True,
+        ),
+        in_files=dict(mandatory=True, ),
+        threshold=dict(usedefault=True, ),
+    )
+    inputs = ACM.input_spec()
+
+    for key, metadata in list(input_map.items()):
+        for metakey, value in list(metadata.items()):
+            assert getattr(inputs.traits()[key], metakey) == value
+def test_ACM_outputs():
+    output_map = dict(
+        acm_neg=dict(),
+        acm_pos=dict(),
+        out_file=dict(),
+    )
+    outputs = ACM.output_spec()
+
+    for key, metadata in list(output_map.items()):
+        for metakey, value in list(metadata.items()):
+            assert getattr(outputs.traits()[key], metakey) == value