fixed handling of output of sim.create() (was wrong order)

CHANGES.md

@@ -20,6 +20,8 @@
 
 - Made cells diversity work with popParams based on `cellsList` and `gridSpacing`
 
+- Fixed handling of output of `sim.create()` (was wrong order)
+
 # Version 1.0.5
 
 **New features**

examples/intervalSaveWeights/src/init.py

@@ -38,7 +38,7 @@ def saveWeights(simTime):
 
 print("Starting sim ...")
 
-(pops, cells, conns, stims, rxd, simData) = sim.create(netParams, cfg, output=True)
+(pops, cells, conns, rxd, stims, simData) = sim.create(netParams, cfg, output=True)
 
 # we run with an interval function defined above
 # if you just want to save the data and not the wieghts you can use the sim.intervalSave function instead of saveWeights

examples/intervalSaving/src/init.py

@@ -18,7 +18,7 @@
 
 print("Starting sim ...")
 
-(pops, cells, conns, stims, rxd, simData) = sim.create(netParams, cfg, output=True)
+(pops, cells, conns, rxd, stims, simData) = sim.create(netParams, cfg, output=True)
 
 # saveInterval defines how often the data is saved
 sim.runSimWithIntervalFunc(cfg.saveInterval, sim.intervalSave)

netpyne/sim/wrappers.py

@@ -172,7 +172,7 @@ def createSimulate(netParams=None, simConfig=None, output=False):
 
     from .. import sim
 
-    (pops, cells, conns, stims, rxd, simData) = sim.create(netParams, simConfig, output=True)
+    (pops, cells, conns, rxd, stims, simData) = sim.create(netParams, simConfig, output=True)
     sim.simulate()
 
     if output:
@@ -210,7 +210,7 @@ def createSimulateAnalyze(netParams=None, simConfig=None, output=False):
 
     from .. import sim
 
-    (pops, cells, conns, stims, rxd, simData) = sim.create(netParams, simConfig, output=True)
+    (pops, cells, conns, rxd, stims, simData) = sim.create(netParams, simConfig, output=True)
     sim.simulate()
     sim.analyze()
     if output:
@@ -254,7 +254,7 @@ def createSimulateAnalyzeInterval(netParams, simConfig, output=False, interval=N
     import os
     from .. import sim
 
-    (pops, cells, conns, stims, rxd, simData) = sim.create(netParams, simConfig, output=True)
+    (pops, cells, conns, rxd, stims, simData) = sim.create(netParams, simConfig, output=True)
     try:
         if sim.rank == 0:
             if os.path.exists('temp'):
@@ -317,7 +317,7 @@ def createSimulateAnalyzeDistributed(netParams, simConfig, output=False, filenam
     import os
     from .. import sim
 
-    (pops, cells, conns, stims, rxd, simData) = sim.create(netParams, simConfig, output=True)
+    (pops, cells, conns, rxd, stims, simData) = sim.create(netParams, simConfig, output=True)
 
     sim.runSim()
     sim.saveDataInNodes(filename=filename, saveLFP=includeLFP, removeTraces=False)