Merge pull request #346 from PTraeder/model-review

Implement changes proposed in discussion of #343
nest · Apr 18, 2017 · 0e5ad3c · 0e5ad3c
2 parents 279c571 + cc67a17
commit 0e5ad3c
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/models/iaf_chxk_2008_implicit.nestml b/models/iaf_chxk_2008_implicit.nestml
@@ -73,11 +73,11 @@ neuron iaf_chxk_2008_implicit:
   internals:
     # Impulse to add to DG_EXC on spike arrival to evoke unit-amplitude
     # conductance excursion.
-    PSConInit_E real = 1.0 ms * e / tau_syn_ex
+    PSConInit_E nS/ms = 1.0 nS * e / tau_syn_ex
 
     # Impulse to add to DG_INH on spike arrival to evoke unit-amplitude
     # conductance excursion.
-    PSConInit_I real = 1.0 ms * e / tau_syn_in
+    PSConInit_I nS/ms = 1.0 nS * e / tau_syn_in
 
     PSConInit_AHP real = g_ahp * e / tau_ahp * 1 [ms/nS]
   end
@@ -117,8 +117,8 @@ neuron iaf_chxk_2008_implicit:
       emit_spike()
     end
 
-    g_ex' += spikesExc * PSConInit_E * 1 [nS/ms]
-    g_in' += spikesInh * PSConInit_I * 1 [nS/ms]
+    g_ex' += spikesExc * PSConInit_E
+    g_in' += spikesInh * PSConInit_I
     I_stim = currents
   end
 

diff --git a/models/iaf_cond_beta.nestml b/models/iaf_cond_beta.nestml
@@ -65,11 +65,11 @@ neuron iaf_cond_beta_neuron:
   internals:
     # Impulse to add to GE' on spike arrival to evoke unit-amplitude
     # conductance excursion.
-    PSConInit_E real = 1.0 * e / tau_syn_rise_E * 1 ms
+    PSConInit_E nS/ms = 1.0 nS * e / tau_syn_rise_E
 
     # Impulse to add to GI' on spike arrival to evoke unit-amplitude
     # conductance excursion.
-    PSConInit_I real = 1.0 * e / tau_syn_rise_I * 1 ms
+    PSConInit_I nS/ms = 1.0 nS * e / tau_syn_rise_I
 
     RefractoryCounts integer = steps(t_ref) # refractory time in steps
     r integer                               # counts number of tick during the refractory period
@@ -97,8 +97,8 @@ neuron iaf_cond_beta_neuron:
 
     end
 
-    GE' += spikeExc * PSConInit_E * 1 [nS/ms]
-    GI' += spikeInh * PSConInit_I * 1 [nS/ms]
+    GE' += spikeExc * PSConInit_E
+    GI' += spikeInh * PSConInit_I
     I_stim = currents
   end
 

diff --git a/models/iaf_cond_exp_implicit.nestml b/models/iaf_cond_exp_implicit.nestml
@@ -61,11 +61,11 @@ neuron iaf_cond_exp_implicit:
   internals:
     # Impulse to add to g_ex' on spike arrival to evoke unit-amplitude
     # conductance excursion.
-    PSConInit_E real = 1.0 ms * e / tau_synE
+    PSConInit_E nS/ms = 1.0 nS * e / tau_synE
 
     # Impulse to add to g_in' on spike arrival to evoke unit-amplitude
     # conductance excursion.
-    PSConInit_I real = 1.0 ms * e / tau_synI
+    PSConInit_I nS/ms = 1.0 nS * e / tau_synI
 
     RefractoryCounts integer = steps(t_ref) # refractory time in steps
     r integer                               # counts number of tick during the refractory period

diff --git a/models/terub_neuron_gpe.nestml b/models/terub_neuron_gpe.nestml
@@ -150,8 +150,8 @@ neuron terub_neuron_gpe:
   end
 
   internals:
-    PSCurrInit_E real = 1.0 ms * e / tau_syn_ex
-    PSCurrInit_I real = 1.0 ms * e / tau_syn_in
+    PSCurrInit_E pA/ms = 1.0 pA * e / tau_syn_ex
+    PSCurrInit_I pA/ms = 1.0 pA * e / tau_syn_in
     refractory_counts integer = steps(t_ref)
     r integer # counts number of tick during the refractory period
   end
@@ -179,8 +179,8 @@ neuron terub_neuron_gpe:
     # set new input current
     I_stim = currents
 
-    g_ex' += spikeExc * PSCurrInit_E * 1 [pA/ms]
-    g_in' += spikeInh * PSCurrInit_I * 1 [pA/ms]
+    g_ex' += spikeExc * PSCurrInit_E 
+    g_in' += spikeInh * PSCurrInit_I 
   end
 
 end