Changeset 1046

Timestamp:

01/06/12 17:45:50 (5 months ago)

Author:

apdavison

Message:

A few small fixes.

Location:

trunk

Files:

• src/nest/standardmodels/electrodes.py (modified) (1 diff)
• src/neuron/standardmodels/electrodes.py (modified) (2 diffs)
• src/standardmodels/electrodes.py (modified) (3 diffs)
• test/system/scenarios.py (modified) (1 diff)
• test/system/test_neuron.py (modified) (1 diff)
• test/unittests/test_neuron.py (modified) (1 diff)

trunk/src/nest/standardmodels/electrodes.py

@@ -40 +40 @@
         if isinstance(cell_list, (Population, PopulationView, Assembly)):
             self.cell_list = [cell for cell in cell_list]
+        else:
+            self.cell_list = cell_list
         nest.DivergentConnect(self._device, self.cell_list)
 

trunk/src/neuron/standardmodels/electrodes.py

@@ -82 +82 @@
                     self._devices.append(self._h_iclamps[id])
                 self._update_iclamp(self._h_iclamps[id])
-                
+
 
 class DCSource(NeuronCurrentSource, electrodes.DCSource):
@@ -96 +96 @@
     _is_playable = False
     _is_computed = False
+
 
 class StepCurrentSource(NeuronCurrentSource, electrodes.StepCurrentSource):

trunk/src/standardmodels/electrodes.py

@@ -22 +22 @@
         'amplitude'     : 1.0,       #  
         'start'         : 0.0,      # 
-        'stop'          : 100000.0,  # 
+        'stop'          : 1e12,  # 
     }
 
@@ -41 +41 @@
         'amplitude'     : 1.0,      #  
         'start'         : 0.0,     # 
-        'stop'          : 100000.0, # 
+        'stop'          : 1e12, # 
         'frequency'     : 10.,
         'offset'        : 0.,
@@ -92 +92 @@
         'stdev'          : 1.,
         'start'          : 0.,
-        'stop'           : 100000.0,
+        'stop'           : 1e12,
         'dt'             : 0.1
     }

trunk/test/system/scenarios.py

@@ -351 +351 @@
 
     for rec in data:
-        assert_arrays_almost_equal(rec, data[0], 1e-12)
+        assert_arrays_almost_equal(rec, data[0], 1e-11)
 
 

trunk/test/system/test_neuron.py

@@ -118 +118 @@
     p1.initialize('v', -63.0)
 
-    current_source = nrn.StepCurrentSource([50.0, 110.0, 150.0, 210.0],
-                                           [0.4, 0.6, -0.2, 0.2])
+    current_source = nrn.StepCurrentSource({'times': [50.0, 110.0, 150.0, 210.0],
+                                            'amplitudes': [0.4, 0.6, -0.2, 0.2]})
     p1.inject(current_source)
 

trunk/test/unittests/test_neuron.py

@@ -1 +1 @@
 from neuron import h
-from pyNN.neuron import electrodes, recording, simulator
 from pyNN.common import populations
+from pyNN.neuron.standardmodels import electrodes
+from pyNN.neuron import recording, simulator
 from mock import Mock
 from nose.tools import assert_equal, assert_raises, assert_almost_equal