Changeset 187

Timestamp:

01/29/08 10:36:19 (10 months ago)

Author:

apdavison

Message:

Finished merging changes from trunk r183 to multifile branch.

Files:

• branches/multifile/src/nest1/cells.py (modified) (1 diff)
• branches/multifile/src/neuron/cells.py (modified) (1 diff)
• branches/multifile/src/pcsim/__init__.py (modified) (5 diffs)

branches/multifile/src/nest1/cells.py

@@ -109 +109 @@
-
-
+class IF_facets_hardware1(common.IF_facets_hardware1):
+    """Leaky integrate and fire model with conductance-based synapses and fixed
+    threshold as it is resembled by the FACETS Hardware Stage 1. For further
+    details regarding the hardware model see the FACETS-internal Wiki:
+    https://facets.kip.uni-heidelberg.de/private/wiki/index.php/WP7_NNM
+    """
+    # in 'iaf_sfa_neuron', the dimension of C is pF,
+    # while in the pyNN context, cm is given in nF
+    translations = {
+        'v_reset'   : ('Vreset',        "parameters['v_reset']"),
+        'v_rest'    : ('U0',            "parameters['v_rest']"),
+        'v_thresh'  : ('Theta',         "parameters['v_thresh']"),
+        'e_rev_E'   : ('V_reversal_E',  "parameters['e_rev_E']"),
+        'e_rev_I'   : ('V_reversal_I',  "parameters['e_rev_I']"),
+        'cm'        : ('C',             "parameters['cm']*1000.0"),
+        'tau_refrac': ('TauR',          "max(dt,parameters['tau_refrac'])"),
+        'tau_syn_E' : ('TauSyn_E',      "parameters['tau_syn_E']"),
+        'tau_syn_I' : ('TauSyn_I',      "parameters['tau_syn_I']"),
+        'g_leak'    : ('gL',            "parameters['g_leak']")
+    }
+    nest_name = "iaf_sfa_neuron"
+
+    def __init__(self, parameters):
+        common.IF_facets_hardware1.__init__(self,parameters)
+        self.parameters = self.translate(self.parameters)
+        self.parameters['q_relref'] = 0.0
+        self.parameters['q_sfa']    = 0.0
+        self.parameters['python']   = True
+
+
-class SpikeSourcePoisson(common.SpikeSourcePoisson):
-    """Spike source, generating spikes according to a Poisson process."""

branches/multifile/src/neuron/cells.py

@@ -110 +110 @@
-        self.parameters['syn_type']  = 'conductance'
-        self.parameters['syn_shape'] = 'exp'
+
+class IF_facets_hardware1(common.IF_facets_hardware1):
+    """Leaky integrate and fire model with conductance-based synapses and fixed
+    threshold as it is resembled by the FACETS Hardware Stage 1. For further
+    details regarding the hardware model see the FACETS-internal Wiki:
+    https://facets.kip.uni-heidelberg.de/private/wiki/index.php/WP7_NNM
+    """
+
+    translations = {
+        'tau_m'     : ('tau_m'    , "parameters['tau_m']"),
+        'cm'        : ('CM'       , "parameters['cm']"),
+        'v_rest'    : ('v_rest'   , "parameters['v_rest']"),
+        'v_thresh'  : ('v_thresh' , "parameters['v_thresh']"),
+        'v_reset'   : ('v_reset'  , "parameters['v_reset']"),
+        'tau_refrac': ('t_refrac' , "parameters['tau_refrac']"),
+        'g_leak'    : ('tau_m'    , "parameters['cm']*1000./parameters['g_leak']"),
+        'tau_syn_E' : ('tau_e'    , "parameters['tau_syn_E']"),
+        'tau_syn_I' : ('tau_i'    , "parameters['tau_syn_I']"),
+        'v_init'    : ('v_init'   , "parameters['v_init']"),
+        'e_rev_E'   : ('e_e'      , "parameters['e_rev_E']"),
+        'e_rev_I'   : ('e_i'      , "parameters['e_rev_I']")
+    }
+    hoc_name = "StandardIF"
+
+    def __init__(self,parameters):
+        common.IF_facets_hardware1.__init__(self,parameters)
+
+        self.parameters = self.translate(self.parameters)
+        self.parameters['syn_type']  = 'conductance'
+        self.parameters['syn_shape'] = 'exp'
+        self.parameters['i_offset']  = 0.0
+
-
-class SpikeSourcePoisson(common.SpikeSourcePoisson):

branches/multifile/src/pcsim/__init__.py

@@ -222 +222 @@
-        else:
-            for i, rec, src in self.recordings:
-pcsim_globals.net.object(rec).getRecordedValues(
+list(pcsim_globals.net.object(rec).getRecordedValues()
-                for v in analog_values:
-                    f.write("%s " % v)                
@@ -501 +501 @@
-    }
-    
-SpikeTrainGenerator
+InputNeuron
-    simObjFactory = None
-    setterMethods = {}
@@ -509 +509 @@
-        self.parameters = self.translate(self.parameters)
-        self.setterMethods = {}        
-SpikeTrainGenerator
- start = self.parameters["
+InputNeuron
+Tstart = self.parameters["T
-                                                        duration = self.parameters["duration"])
-    
-    def translate(self,parameters):
-        translated_parameters = common.SpikeSourcePoisson.translate(self,parameters)
-start'] = Time.sec(translated_parameters['start'])
-Time.sec(translated_parameters['duration'])
+Tstart'] = translated_parameters['start']
+translated_parameters['duration']
-        return translated_parameters
-    
@@ -570 +570 @@
-        ('tau_syn_I' , 'TauSynInh',  1e-3),
-    )
-
+CondAlpha
-    simObjFactory = None
-    setterMethods = {}
@@ -581 +581 @@
-        limited_parameters = {}
-        for k in ('a','b','Vt','Vr','El','gl','Cm','tau_w','slope','Vpeak',
-
+
+
-            limited_parameters[k] = self.parameters[k]
-
+CondAlpha
-        
-