Merge remote-tracking branch 'origin/salva_changes' into development

Author: tarelli

netpyne_ui/netpyne_geppetto.py

@@ -164,15 +164,23 @@ def exportModel(self, modelParameters):
             return self.getJSONError("Error while exporting the NetPyNE model",traceback.format_exc())
 
     def instantiateNetPyNEModel(self):
-        sim.create(netParams, simConfig)
+        import sys; reload(sys)
+        sim.initialize(netParams, simConfig)  # create network object and set cfg and net params
+        sim.net.createPops()                  # instantiate network populations
+        sim.net.createCells()                 # instantiate network cells based on defined populations
+        sim.net.connectCells()                # create connections between cells based on params
+        sim.net.addStims()                    # add external stimulation to cells (IClamps etc)
+    
         sim.net.defineCellShapes()  # creates 3d pt for cells with stylized geometries
         sim.gatherData(gatherLFP=False)
         #sim.saveData()
         return sim
 
     def simulateNetPyNEModel(self):
+        import sys; reload(sys)
+        sim.setupRecording() 
         sim.simulate()
-        sim.analyze()
+        sim.saveData()
         return sim
 
     def rename(self, path, oldValue,newValue):