fix examples, do not set required for new iqms, code cleanup in tests

nipreps · May 26, 2017 · d33c0b7 · d33c0b7
1 parent 67b3461
commit d33c0b7
Show file tree

Hide file tree

Showing 3 changed files with 135 additions and 123 deletions.
diff --git a/dockereve-master/eve-app/settings.py b/dockereve-master/eve-app/settings.py
@@ -103,10 +103,6 @@
         'type': 'float',
         'required': True
     },
-    'task_id': {
-        'type': 'string',
-        'required': True
-    },
     'size_t': {
         'type': 'float',
         'required': True
@@ -357,12 +353,10 @@
         'required': True
     },
     'summary_bg_median': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_bg_mad': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_bg_p05': {
         'type': 'float',
@@ -377,8 +371,7 @@
         'required': True
     },
     'summary_bg_n': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_csf_k': {
         'type': 'float',
@@ -389,12 +382,10 @@
         'required': True
     },
     'summary_csf_median': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_csf_mad': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_csf_p05': {
         'type': 'float',
@@ -409,8 +400,7 @@
         'required': True
     },
     'summary_csf_n': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_gm_k': {
         'type': 'float',
@@ -421,12 +411,10 @@
         'required': True
     },
     'summary_gm_median': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_gm_mad': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_gm_p05': {
         'type': 'float',
@@ -441,8 +429,7 @@
         'required': True
     },
     'summary_gm_n': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_wm_k': {
         'type': 'float',
@@ -453,12 +440,10 @@
         'required': True
     },
     'summary_wm_median': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_wm_mad': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'summary_wm_p05': {
         'type': 'float',
@@ -473,8 +458,7 @@
         'required': True
     },
     'summary_wm_n': {
-        'type': 'float',
-        'required': True
+        'type': 'float'
     },
     'tpm_overlap_csf': {
         'type': 'float',

diff --git a/test/bold/validData/image_bold.json b/test/bold/validData/image_bold.json
@@ -1,5 +1,4 @@
 {
-    "modality" : "bold",
     "aor": 0.034428499999999994,
     "aqi": 0.0005224403999999999,
     "dvars_nstd": 10.191722418947368,
@@ -17,7 +16,6 @@
     "gcor": 0.2162099838256836,
     "gsr_x": -0.004743137396872044,
     "gsr_y": 0.02154964953660965,
-    "task_id": "rhymejudgment",
     "size_t": 20,
     "size_x": 16,
     "size_y": 16,
@@ -29,13 +27,26 @@
     "spacing_z": 16,
     "summary_bg_k": 10.199746320897564,
     "summary_bg_mean": 10.67599868774414,
+    "summary_bg_median": 10.67599868774414,
     "summary_bg_p05": 3.4488043785095215,
     "summary_bg_p95": 21.972539520263666,
     "summary_bg_stdv": 5.769111156463623,
+    "summary_bg_mad": 5.769111156463623,
+    "summary_bg_n": 5000000,
     "summary_fg_k": -1.6145134278870812,
     "summary_fg_mean": 290.6355895996094,
+    "summary_fg_median": 290.6355895996094,
     "summary_fg_p05": 13.376275062561035,
     "summary_fg_p95": 631.4849853515625,
     "summary_fg_stdv": 238.1324462890625,
-    "tsnr": 108.249267578125
+    "summary_fg_mad": 238.1324462890625,
+    "summary_fg_n": 2000000,
+    "tsnr": 108.249267578125,
+    "modality" : "bold",
+    "subject_id": "203902",
+    "task_id": "rhymejudgment",
+    "TaskName": "Rhyme Judgment",
+    "version": "0.9.4",
+    "md5sum": "75cab8005361c2504ba5a7f02ecbacd7",
+    "software": "mriqc"
 }