Merge branch 'main' of github.com:mesoscope/cellpack into fix/gradien…

…t_invert
mesoscope · Sep 27, 2023 · 8a42eb9 · 8a42eb9
2 parents 5a22e24 + fee423f
commit 8a42eb9
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 8 deletions.
diff --git a/cellpack/autopack/loaders/config_loader.py b/cellpack/autopack/loaders/config_loader.py
@@ -43,6 +43,7 @@ class ConfigLoader(object):
         "show_sphere_trees": False,
         "show_progress_bar": False,
         "spacing": None,
+        "upload_results": False,
         "use_periodicity": False,
         "version": 1.0,
     }

diff --git a/cellpack/autopack/writers/__init__.py b/cellpack/autopack/writers/__init__.py
@@ -185,7 +185,10 @@ def save_as_simularium(self, env, all_ingr_as_array, compartments):
         file_name = env.helper.writeToFile(
             env.result_file, env.boundingBox, env.name, env.version
         )
-        autopack.helper.post_and_open_file(file_name)
+        if env.config_data.get(
+            "upload_results", env.config_data.get("number_of_packings", 1) <= 1
+        ):
+            autopack.helper.post_and_open_file(file_name)
 
     def save_Mixed_asJson(
         self,

diff --git a/cellpack/tests/packing-configs/test_parallel_config.json b/cellpack/tests/packing-configs/test_parallel_config.json
@@ -14,5 +14,6 @@
     "number_of_packings": 5,
     "spacing":  null,
     "use_periodicity": false,
-    "show_sphere_trees": true
+    "show_sphere_trees": true,
+    "upload_results": false
 }
diff --git a/cellpack/tests/packing-configs/test_variable_count_config.json b/cellpack/tests/packing-configs/test_variable_count_config.json
@@ -13,5 +13,6 @@
     "spacing": null,
     "parallel": false,
     "use_periodicity": false,
-    "show_sphere_trees": true
+    "show_sphere_trees": true,
+    "upload_results": false
 }
diff --git a/examples/packing-configs/pcna_parallel_packing_config.json b/examples/packing-configs/pcna_parallel_packing_config.json
@@ -16,5 +16,6 @@
     "show_progress_bar": true,
     "spacing": 2.5,
     "use_periodicity": false,
-    "show_sphere_trees": false
+    "show_sphere_trees": false,
+    "upload_results": false
 }
diff --git a/examples/packing-configs/peroxisome_packing_config.json b/examples/packing-configs/peroxisome_packing_config.json
@@ -14,5 +14,6 @@
     "spacing": 2.5,
     "use_periodicity": false,
     "show_sphere_trees": false,
-    "load_from_grid_file": false
+    "load_from_grid_file": true,
+    "upload_results": false
 }
diff --git a/examples/packing-configs/peroxisome_parallel_packing_config.json b/examples/packing-configs/peroxisome_parallel_packing_config.json
@@ -18,7 +18,8 @@
     "show_sphere_trees": false,
     "image_export_options": {
         "hollow": false,
-        "voxel_size": [1,1,1],
+        "voxel_size": [1, 1, 1],
         "projection_axis": "z"
-    }
+    },
+    "upload_results": false
 }
diff --git a/examples/packing-configs/run.json b/examples/packing-configs/run.json
@@ -13,5 +13,6 @@
     "use_periodicity": false,
     "show_sphere_trees": false,
     "load_from_grid_file": false,
-    "save_converted_recipe": true
+    "save_converted_recipe": true,
+    "upload_results": true
 }