Changeset 965 for trunk

Show
Ignore:
Timestamp:
05/24/11 10:20:40 (12 months ago)
Author:
apdavison
Message:

neuron.nineml now ensures that common.simulator is set correctly

Location:
trunk
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • trunk/examples/nineml_neuron.py

    r964 r965  
    1515from pyNN.neuron.nineml import nineml_cell_type 
    1616from pyNN.utility import init_logging 
    17  
    18 import pyNN.common, pyNN.recording 
    19 pyNN.common.simulator = sim.simulator 
    20 pyNN.recording.simulator = sim.simulator 
    2117 
    2218from copy import deepcopy 
  • trunk/src/neuron/nineml.py

    r964 r965  
    2727import os 
    2828from itertools import chain 
     29from pyNN.neuron import simulator 
     30from pyNN import common, recording 
     31common.simulator = simulator 
     32recording.simulator = simulator 
    2933 
    3034h = neuron.h