Merge pull request #567 from MetaCell/feature/566

#566 fix experiments param assigment

Author: ddelpiano

netpyne_ui/__init__.py

@@ -1,9 +1,32 @@
+import logging
+import sys
+import os
+
 from jupyter_geppetto.webapi import RouteManager
 from netpyne_ui import api
+from netpyne_ui.constants import HERE
 import sentry_sdk
 
 sentry_sdk.init(
     "https://d8bf7e40eec34cb9891f6dd8207b5e83@sentry.metacell.us/6"
 )
 
+def init_eeg():
+    import sys
+    from netpyne_ui.constants import HERE
+    # FIXES library asking for input to download
+    sys.stdin = open(os.path.join(HERE, "resources/stdin.txt"),'r') 
+    from lfpykit.eegmegcalc import NYHeadModel
+    try:
+        NYHeadModel() # Downloads the model if does not exist
+    except:
+        logging.error("Error initializing the EEG head model", exc_info=True)
+
+from multiprocessing import Process
+thread = Process(target = init_eeg)
+thread.start()
+
+
 RouteManager.add_controller(api.NetPyNEController)
+
+

netpyne_ui/netpyne_geppetto.py

@@ -75,6 +75,16 @@ def __init__(self):
         if not simulations.local.is_running():
             [experiments.set_to_error(e) for e in running_exps]
 
+        # sys.stdin = open(os.path.join(constants.HERE, "stdin.txt"),'r') # FIXES library asking for input to download -- eg lfpykit models
+
+        # from ipykernel import kernelbase
+
+        # def raw_input(self, prompt=''):
+        #     return "y"
+        # kernelbase.Kernel.raw_input = raw_input
+
+        # from lfpykit.eegmegcalc import NYHeadModel
+        # NYHeadModel()
 
     def getData(self):
         return {

netpyne_ui/resources/stdin.txt

@@ -0,0 +1,5 @@
+y
+y
+y
+y
+y

netpyne_ui/templates/batch.py

@@ -46,9 +46,9 @@ def run_batch(experiment):
     params = specs.ODict()
     grouped_params = []
     for param in experiment["params"]:
-        params[param["mapsTo"].replace("simConfig.", "")] = param["values"]
+        params[param["mapsTo"].replace("netParams.", "")] = param["values"]
         if param["inGroup"]:
-            grouped_params.append(param["mapsTo"].replace("simConfig.", ""))
+            grouped_params.append(param["mapsTo"].replace("netParams.", ""))
 
     with open("netParams.json", "r") as f:
         net_params = json.load(f)

webapp/components/topbar/dialogs/LaunchDialog.js

@@ -317,7 +317,7 @@ const LaunchDialog = (props) => {
           <Box className="wrap">
             <img src={value === LAUNCH_MODAL.experimentState ? experimentSelected : experimentUnselected} alt="completeExperiment" />
             <Typography>
-              All Trials (
+              All Conditions (
               {numberOfTrials}
               )
             </Typography>

webapp/constants.js

@@ -571,34 +571,35 @@ export const EDIT_WIDGETS = {
       model: 'netParams.stimTargetParams',
     },
   },
-  analysis: {
-    id: 'analysis',
-    name: 'Plot Settings',
-    model: 'simConfig.analysis',
+  rxd: {
+    id: 'rxd',
+    name: 'Reaction-Diffusion',
+    model: 'netParams.rxdParams',
     status: WidgetStatus.HIDDEN,
     hideOnClose: true,
-    component: 'analysis',
+    component: 'rxd',
     panelName: TOP_PANEL,
     enableRename: false,
     pos: 6,
     props: {
-      model: 'simConfig.analysis',
+      model: 'netParams.rxdParams',
     },
   },
-  rxd: {
-    id: 'rxd',
-    name: 'Rxd Configuration',
-    model: 'netParams.rxdParams',
+  analysis: {
+    id: 'analysis',
+    name: 'Plot Settings',
+    model: 'simConfig.analysis',
     status: WidgetStatus.HIDDEN,
     hideOnClose: true,
-    component: 'rxd',
+    component: 'analysis',
     panelName: TOP_PANEL,
     enableRename: false,
     pos: 7,
     props: {
-      model: 'netParams.rxdParams',
+      model: 'simConfig.analysis',
     },
   },
+
   simConfig: {
     id: 'simConfig',
     name: 'Configuration',