Merge branch 'apical_and_yaml' of github.com:BlueBrain/BluePyMM into apical_and_yaml

arnaudon · arnaudon · commit 9e98ec3077f7 · 2020-06-26T09:32:21.000+02:00
diff --git a/bluepymm/run_combos/calculate_scores.py b/bluepymm/run_combos/calculate_scores.py
@@ -341,7 +341,7 @@ def calculate_scores(final_dict, emodel_dirs, scores_db_filename,
     arg_list = create_arg_list(scores_db_filename,
                                emodel_dirs,
                                final_dict,
-                               use_apical_points)
+                               use_apical_points=use_apical_points)
 
     print('Parallelising score evaluation of %d me-combos' % len(arg_list))
 
diff --git a/bluepymm/tests/examples/simple1/simple1_conf_run.json b/bluepymm/tests/examples/simple1/simple1_conf_run.json
@@ -1,6 +1,5 @@
 {
     "version": "1.0",
     "scores_db": "./output/scores.sqlite",
-    "output_dir": "./output/",
-    "use_apical_points": false
+    "output_dir": "./output/"
 }
diff --git a/bluepymm/tests/test_calculate_scores.py b/bluepymm/tests/test_calculate_scores.py
@@ -383,8 +383,7 @@ def test_calculate_scores():
                 final_dict,
                 emodel_dirs,
                 test_db_filename,
-                use_ipyp=use_ipyp,
-                use_apical_points=False
+                use_ipyp=use_ipyp
             )
 
         if use_ipyp:

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`{`
`2`	`2`	`"version": "1.0",`
`3`	`3`	`"scores_db": "./output/scores.sqlite",`
`4`		`- "output_dir": "./output/",`
`5`		`- "use_apical_points": false`
	`4`	`+ "output_dir": "./output/"`
`6`	`5`	`}`