Merge pull request #53 from neuroscout/fix/dummycontrasts

Change AutoContrasts to DummyContrasts. Fixes #52

Author: adelavega

pyns/models/analysis.py

@@ -157,7 +157,7 @@ def clone(self, id):
     def create_analysis(self, *, name, dataset_name, predictor_names,
                         task=None, subject=None, run=None, session=None,
                         hrf_variables=None, contrasts=None,
-                        auto_contrasts=True, transformations=None, **kwargs):
+                        dummy_contrasts=True, transformations=None, **kwargs):
         """ Analysis creation "wizard". Given run selection filters, and name
         of Predictors, builds Analysis object with prepopulated BIDS model.
         """
@@ -214,7 +214,7 @@ def create_analysis(self, *, name, dataset_name, predictor_names,
             name, predictor_names, task,
             subject=subject, run=run, session=session,
             hrf_variables=hrf_variables, transformations=transformations,
-            contrasts=contrasts, auto_contrasts=auto_contrasts
+            contrasts=contrasts, dummy_contrasts=dummy_contrasts
             )
 
         analysis = Analysis(analyses=self, dataset_id=dataset['id'],

pyns/models/utils.py

@@ -3,7 +3,7 @@
 
 def build_model(name, variables, task, subject, run=None, session=None,
                 hrf_variables=None, transformations=None,
-                contrasts=None, auto_contrasts=True):
+                contrasts=None, dummy_contrasts=True):
     """ Builds a basic two level BIDS-Model """
     hrf_variables = hrf_variables or []
     transformations = transformations or []
@@ -20,7 +20,7 @@ def build_model(name, variables, task, subject, run=None, session=None,
     model = {
         "Steps": [
           {
-            "AutoContrasts": auto_contrasts,
+            "DummyContrasts": {"Type": "t"},
             "Contrasts": contrasts,
             "Level": "Run",
             "Model": {
@@ -38,18 +38,22 @@ def build_model(name, variables, task, subject, run=None, session=None,
 
     model['Steps'].append(
         {
-            "AutoContrasts": True,
+            "DummyContrasts": {"Type": "FEMA"},
             "Level": "Subject"
         }
     )
 
     model['Steps'].append(
         {
-            "AutoContrasts": True,
+            "DummyContrasts": {"Type": "t"},
             "Level": "Dataset"
         }
     )
 
+    if not dummy_contrasts:
+        for s in model['Steps']:
+            s.pop('DummyContrasts')
+
     if run is not None:
         model['Input']['Run'] = run
 

tests/cassettes/analysis.json

@@ -1,11 +1,11 @@
 {
   "http_interactions": [
     {
-      "recorded_at": "2019-09-12T22:54:14",
+      "recorded_at": "2019-12-16T22:01:59",
       "request": {
         "body": {
           "encoding": "utf-8",
-          "string": "{\"dataset_id\": 5, \"model\": {\"Steps\": [{\"AutoContrasts\": true, \"Contrasts\": [], \"Level\": \"Run\", \"Model\": {\"X\": [\"brightness\"]}, \"Transformations\": []}, {\"AutoContrasts\": true, \"Level\": \"Dataset\"}], \"Input\": {\"Subject\": [\"28\"], \"Task\": \"MerlinMovie\"}, \"Name\": \"pytest_analysis\"}, \"name\": \"pytest_analysis\", \"predictors\": [12728], \"runs\": [126], \"task_name\": \"MerlinMovie\"}"
+          "string": "{\"dataset_id\": 5, \"model\": {\"Steps\": [{\"DummyContrasts\": {\"Type\": \"t\"}, \"Contrasts\": [], \"Level\": \"Run\", \"Model\": {\"X\": [\"brightness\"]}, \"Transformations\": []}, {\"DummyContrasts\": {\"Type\": \"t\"}, \"Level\": \"Dataset\"}], \"Input\": {\"Subject\": [\"28\"], \"Task\": \"MerlinMovie\"}, \"Name\": \"pytest_analysis\"}, \"name\": \"pytest_analysis\", \"predictors\": [12728], \"runs\": [126], \"task_name\": \"MerlinMovie\"}"
         },
         "headers": {
           "Accept": [
@@ -15,13 +15,13 @@
             "gzip, deflate"
           ],
           "Authorization": [
-            "JWT eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1Njg5MzM2NDQsImlhdCI6MTU2ODMyODg0NCwibmJmIjoxNTY4MzI4ODQ0LCJpZGVudGl0eSI6MX0.2d1tXjaviiP005FWpIoYwoNHaGG9YM4B8Zf51AR6QlU"
+            "JWT eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NzcxMzgyNTMsImlhdCI6MTU3NjUzMzQ1MywibmJmIjoxNTc2NTMzNDUzLCJpZGVudGl0eSI6MX0.spYLzByUnmkff8CC6iK8tQRwOSzjimjaJOSqQ7mwDMU"
           ],
           "Connection": [
             "keep-alive"
           ],
           "Content-Length": [
-            "370"
+            "390"
           ],
           "Content-Type": [
             "application/json"
@@ -35,7 +35,7 @@
       },
       "response": {
         "body": {
-          "base64_string": "H4sIAAAAAAAAA3VRTWvCQBC992fMORaTYqu5SaVQaHrQHAoiYUzGujXZDbuzFhH/e2eNKe0ht+XNvo95c4Z8CWl8P4mgtIRMVYEMKSTjeDYaz0ZxkidJOoEIKmR0xIWqIJXfFbnSqpaV0ZBqX9cR7NHtr2P4HuuHTDi1KQ8kwA5rRxE0pqIa0jO86tZzeKz89otKea4hmcImghzdQQQysrXSmTkqgksE79iQoO2JyXGBGuuTU04MVkytE/YZ5p7Ns9Fs0bEgbL0Y/gHWIv5Gx+APS6+Fm/VpPoL91qrPPWtyDjbimFvUbmdsg2HDK/8SDbj0souuIbgEAdlV7dRwnXpopRYt6a7mrtbWUqXKWwyAX8DYECtOnpLpJoDqKOfrM1mvu+mjzBwj+0BeLOcvuSg4v20U98fubCT7obil+lf/3Q+6fREJJAIAAA==",
+          "base64_string": "H4sIAAAAAAAAA42RQUvDQBCF7/6MOafSBFprbmIRBOuhDShICdNkatcmm7AzWy2h/93ZphU9FLztvtn59s2bDrI5pPH1KILCEQqVOQqkkAzj20GcDOJxliTpECIoUZBJclNCqq9L4sKZVkxjIbW+qiLYIG+OZfh8+RrdaU/VFFtSYY0VUwR1U1IFaQePtvUSDgu/+qBCj2+QTGAZQYa8VcCMXGXsrNkZgkMEz1iTqu1eiCVHi9WeDesHC6GWtbuD+8aKQ5ZwU87U1/X+l9ZBtm8DQwLviXbBCMy9VcjsbOs1+Fg5874RS8yw1KeZQ8vrxtUYRj3SD1H3T/60zwwOgaTTm7W5HLC9NGSLjmwffB9066g0xckPwI/QuOAvTm6SyTKIZqcLhVSc1/Cdt311rDUWFB+ap/O7h0wJ7Fe1kfP6+2/U+zY/ufqzkKtvYUfiLDYCAAA=",
           "encoding": null,
           "string": ""
         },
@@ -53,7 +53,7 @@
             "application/json"
           ],
           "Date": [
-            "Thu, 12 Sep 2019 22:54:14 GMT"
+            "Mon, 16 Dec 2019 22:01:59 GMT"
           ],
           "Server": [
             "nginx/1.15.6"

tests/cassettes/analysis_object.json

@@ -1,7 +1,7 @@
 {
   "http_interactions": [
     {
-      "recorded_at": "2019-09-12T22:54:04",
+      "recorded_at": "2019-12-16T21:57:33",
       "request": {
         "body": {
           "encoding": "utf-8",
@@ -15,7 +15,7 @@
             "gzip, deflate"
           ],
           "Authorization": [
-            "JWT eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1Njg5MzM2NDQsImlhdCI6MTU2ODMyODg0NCwibmJmIjoxNTY4MzI4ODQ0LCJpZGVudGl0eSI6NX0.GX1_sJHN-8qXIsl1ZTJYelJvd1GHJPVZgPrYQ5ttxqs"
+            "JWT eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE1NzcxMzgyNTMsImlhdCI6MTU3NjUzMzQ1MywibmJmIjoxNTc2NTMzNDUzLCJpZGVudGl0eSI6MX0.spYLzByUnmkff8CC6iK8tQRwOSzjimjaJOSqQ7mwDMU"
           ],
           "Connection": [
             "keep-alive"
@@ -35,7 +35,7 @@
       },
       "response": {
         "body": {
-          "base64_string": "H4sIAAAAAAAAAxWMSQ6CMAAA7z6DB5iWABFvCFpbbREFBS4GoUKxWBJcMf5dPE4yMx8ty3PedcebuvCrNtX4mwAeO8IXZLWHgVi7pDqh/M846jFkgtjjQZJ8OUj1HLK6NGlPdeYFHW5kVbjYomGk+x59+14JmPsUp4Y0uFYvFiYG7bHhewEYxm2K9vcCScB3QxODsV7AW1xnDyE2AJiLQ4tV8lRsmSFkJ9SYTdKzCZ2tFchI+45+62dTF7wAAAA=",
+          "base64_string": "H4sIAAAAAAAAAxXMTQ6CMBhF0bnLYAEGNPFvpmCwxZYg1KATI6VKKwUMGOQz7t06fMl592NdORdte+nqh6islSUGbIt0LUOJg6MTyb2Li8zn/40YIIdKvBwbVIqdQWrrUOBvAveBJqRFuixyF81IwqZUMSAQOWToZaaxRqp+04RPjAPqMTDh5uwfX7lf2iI2n9Qet81pD5uBVfpxuy1cdyaDRRcd+jAGJbW64jB+RnPde4RZ39EPMcUnqrwAAAA=",
           "encoding": null,
           "string": ""
         },
@@ -53,7 +53,7 @@
             "application/json"
           ],
           "Date": [
-            "Thu, 12 Sep 2019 22:54:04 GMT"
+            "Mon, 16 Dec 2019 21:57:33 GMT"
           ],
           "Server": [
             "nginx/1.15.6"