Improved test protocol, due to long time course of h in unc2

openworm · Apr 30, 2024 · 1053e69 · 1053e69
1 parent 3b0a781
commit 1053e69
Show file tree

Hide file tree

Showing 22 changed files with 76 additions and 45 deletions.
diff --git a/.github/workflows/omv-ci.yml b/.github/workflows/omv-ci.yml
@@ -17,7 +17,7 @@ jobs:
       fail-fast: false
       matrix:
         python-version: [ 3.9, "3.11" ]
-        engine: [ jNeuroML_validate ]
+        engine: [ jNeuroML_validate, XPP ]
 
     steps:
     - uses: actions/checkout@v4

diff --git a/.gitignore b/.gitignore
@@ -18,3 +18,4 @@ report.*.txt
 /NeuroML2/LEMS_Test_RMD_shak.xml
 /NeuroML2/LEMS_Test_*.xml
 /RMD_2.ode
+arm64
diff --git a/NeuroML2/AWCon_cca.channel.nml b/NeuroML2/AWCon_cca.channel.nml
@@ -34,7 +34,7 @@
         <Constant name="f3ca" dimension="none" value="1.7"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmcca1*(p1tmcca1/(exp((1/(f3ca*p3tmcca1))*(-V + p2tmcca1 - stmcca1)) + 1) + p4tmcca1))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmcca1*(p1tmcca1/(exp((1/(f3ca*p3tmcca1))*(-V + p2tmcca1 - stmcca1)) + 1) + p4tmcca1))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="cca_h_inf" extends="baseVoltageDepVariable">
@@ -60,7 +60,7 @@
         <Constant name="f4ca" dimension="none" value="1.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthcca1*(p1thcca1/(exp((1/(f4ca*p3thcca1))*(V - p2thcca1 + sthcca1)) + 1) + p4thcca1))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthcca1*(p1thcca1/(exp((1/(f4ca*p3thcca1))*(V - p2thcca1 + sthcca1)) + 1) + p4thcca1))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/AWCon_kir.channel.nml b/NeuroML2/AWCon_kir.channel.nml
@@ -27,7 +27,7 @@
         <Constant name="p6tmkir" dimension="none" value="3.8329"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(p1tmkir/(exp((-V + p2tmkir)/p3tmkir) + exp((V - p4tmkir)/p5tmkir)) + p6tmkir)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(p1tmkir/(exp((-V + p2tmkir)/p3tmkir) + exp((V - p4tmkir)/p5tmkir)) + p6tmkir)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/AWCon_shak.channel.nml b/NeuroML2/AWCon_shak.channel.nml
@@ -32,7 +32,7 @@
         <Constant name="shiftV05" dimension="none" value="0.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(ptmshak1/(exp((V - (ptmshak2 + shiftV05))/ptmshak3) + exp((-V + ptmshak2 + shiftV05)/ptmshak4)) + ptmshak5)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(ptmshak1/(exp((V - (ptmshak2 + shiftV05))/ptmshak3) + exp((-V + ptmshak2 + shiftV05)/ptmshak4)) + ptmshak5)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="shak_h_inf" extends="baseVoltageDepVariable">
@@ -51,7 +51,7 @@
         <Constant name="pthshak" dimension="none" value="1400.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(pthshak)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(pthshak)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/AWCon_shal.channel.nml b/NeuroML2/AWCon_shal.channel.nml
@@ -39,7 +39,7 @@
         <Constant name="cshal" dimension="none" value="0.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(ptmshal1/(exp((-V + ptmshal2)/ptmshal3) + exp((V - ptmshal4)/ptmshal5)) + ptmshal6))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(ptmshal1/(exp((-V + ptmshal2)/ptmshal3) + exp((V - ptmshal4)/ptmshal5)) + ptmshal6))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="shal_h_hf_inf" extends="baseVoltageDepVariable">
@@ -62,7 +62,7 @@
         <Constant name="cshal" dimension="none" value="0.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthfshal1/(exp((V - pthfshal2)/pthfshal3) + 1) + pthfshal4))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthfshal1/(exp((V - pthfshal2)/pthfshal3) + 1) + pthfshal4))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="shal_h_hs_inf" extends="baseVoltageDepVariable">
@@ -85,7 +85,7 @@
         <Constant name="cshal" dimension="none" value="0.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthsshal1/(exp((V - pthsshal2)/pthsshal3) + 1) + pthsshal4))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthsshal1/(exp((V - pthsshal2)/pthsshal3) + 1) + pthsshal4))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/AWCon_unc2.channel.nml b/NeuroML2/AWCon_unc2.channel.nml
@@ -33,7 +33,7 @@
         <Constant name="constmunc2" dimension="none" value="3.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmunc2*(p1tmunc2/(exp((-V + p2tmunc2 - shiftmunc2)/p3tmunc2) + exp((V - p2tmunc2 + shiftmunc2)/p4tmunc2)) + p5tmunc2))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmunc2*(p1tmunc2/(exp((-V + p2tmunc2 - shiftmunc2)/p3tmunc2) + exp((V - p2tmunc2 + shiftmunc2)/p4tmunc2)) + p5tmunc2))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="unc2_h_inf" extends="baseVoltageDepVariable">
@@ -59,7 +59,7 @@
         <Constant name="shifthunc2" dimension="none" value="30.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthunc2*(p1thunc2/(exp((V - p2thunc2 + shifthunc2)/p3thunc2) + 1) + p4thunc2/(exp((-V + p5thunc2 - shifthunc2)/p6thunc2) + 1)))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthunc2*(p1thunc2/(exp((V - p2thunc2 + shifthunc2)/p3thunc2) + 1) + p4thunc2/(exp((-V + p5thunc2 - shifthunc2)/p6thunc2) + 1)))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/GenerateNeuroML.py b/NeuroML2/GenerateNeuroML.py
@@ -74,13 +74,18 @@ def _add_tc_ss(chan_id_in_cell, gate_id, inf_expr_param, tau_expr_param, chan_do
     s_expr = parse_expr(tau_expr, evaluate=False)
     s_expr = s_expr.subs(v,V)
 
-    dv = component_factory("DerivedVariable", name="t", exposure="t", dimension="time", value='(%s)/1000'%s_expr)
+    dv = component_factory("DerivedVariable", name="t", exposure="t", dimension="time", value='(%s)* TIME_SCALE'%s_expr)
     d.add(dv)
 
     return ss, tc
 
 
-def create_channel_file(chan_id_in_cell, cell_id, xpp, species, gates={}, extra_params=[]):
+def create_channel_file(chan_id_in_cell, 
+                        cell_id, 
+                        xpp, 
+                        species, 
+                        gates={}, 
+                        extra_params=[]):
 
     chan_id = "%s_%s" % (cell_id, chan_id_in_cell)
     chan_doc = NeuroMLDocument(
@@ -130,7 +135,9 @@ def create_channel_file(chan_id_in_cell, cell_id, xpp, species, gates={}, extra_
     return chan_fn
 
 
-def generate_nmllite(cell, duration=700, config="IClamp", parameters=None):
+def generate_nmllite(cell, duration=700, config="IClamp", parameters=None,
+                        stim_delay=310,
+                        stim_duration=500):
     from neuromllite import Cell, InputSource
 
     # from neuromllite.NetworkGenerator import *
@@ -152,7 +159,7 @@ def generate_nmllite(cell, duration=700, config="IClamp", parameters=None):
         input_source = InputSource(
             id="iclamp_0",
             neuroml2_input="PulseGenerator",
-            parameters={"amplitude": "stim_amp", "delay": "310ms", "duration": "500ms"},
+            parameters={"amplitude": "stim_amp", "delay": "%sms"%stim_delay, "duration": "%sms"%stim_duration},
         )
 
     else:
@@ -186,7 +193,11 @@ def generate_nmllite(cell, duration=700, config="IClamp", parameters=None):
     return sim, net
 
 
-def create_cells(channels_to_include):
+def create_cells(channels_to_include,
+                 duration=700,
+                 stim_delay=310,
+                 stim_duration=500):
+
     for cell_id in xpps.keys():
         # Create the nml file and add the ion channels
         cell_doc = NeuroMLDocument(
@@ -271,7 +282,7 @@ def create_cells(channels_to_include):
             )
 
         # EGL-36 CHANNELS
-        if cell_id is not "AWCon" and 'egl36' in channels_to_include:
+        if cell_id != "AWCon" and 'egl36' in channels_to_include:
             chan_id = 'egl36'
             ion = 'k'
             g_param = 'gegl36'
@@ -408,7 +419,9 @@ def create_cells(channels_to_include):
         )
 
         sim, net = generate_nmllite(
-            cell_id, duration=1400, config="IClamp", parameters=None
+            cell_id, duration=duration, config="IClamp", parameters=None,
+                        stim_delay=stim_delay,
+                        stim_duration=stim_duration
         )
 
         ################################################################################
@@ -429,4 +442,7 @@ def create_cells(channels_to_include):
     channels_to_include = ['leak','shal','egl36','kir','shak','cca']
     channels_to_include = ['leak','shal','egl36','kir','shak','cca','unc2','egl19']
     channels_to_include = ['leak','shal','egl36','kir','shak','cca','unc2']
-    create_cells(channels_to_include)
+    channels_to_include = ['leak','unc2']
+    channels_to_include = ['leak','shal','egl36','kir','shak','cca','unc2']
+
+    create_cells(channels_to_include, duration=1800, stim_delay=1310, stim_duration=500)
diff --git a/NeuroML2/IClamp_AWCon.json b/NeuroML2/IClamp_AWCon.json
@@ -14,7 +14,7 @@
             "iclamp_0": {
                 "parameters": {
                     "amplitude": "stim_amp",
-                    "delay": "310ms",
+                    "delay": "1310ms",
                     "duration": "500ms"
                 },
                 "neuroml2_input": "PulseGenerator"

diff --git a/NeuroML2/IClamp_RMD.json b/NeuroML2/IClamp_RMD.json
@@ -14,7 +14,7 @@
             "iclamp_0": {
                 "parameters": {
                     "amplitude": "stim_amp",
-                    "delay": "310ms",
+                    "delay": "1310ms",
                     "duration": "500ms"
                 },
                 "neuroml2_input": "PulseGenerator"

diff --git a/NeuroML2/IClamp_RMD.net.nml b/NeuroML2/IClamp_RMD.net.nml
@@ -5,11 +5,11 @@
     NeuroMLlite parameters: 
         stim_amp = 10pA</notes>
     <include href="RMD.cell.nml"/>
-    <pulseGenerator id="iclamp_0" delay="310ms" duration="500ms" amplitude="10pA"/>
+    <pulseGenerator id="iclamp_0" delay="1310ms" duration="500ms" amplitude="10pA"/>
     <network id="IClamp_RMD" type="networkWithTemperature" temperature="34.0degC">
         <notes>A network model: IClamp_RMD</notes>
         <property tag="recommended_dt_ms" value="0.025"/>
-        <property tag="recommended_duration_ms" value="1400.0"/>
+        <property tag="recommended_duration_ms" value="1800.0"/>
         <population id="pop_RMD" component="RMD" size="1" type="populationList">
             <property tag="color" value="0 0.8 0"/>
             <property tag="region" value="Worm"/>

diff --git a/NeuroML2/LEMS_Sim_IClamp_RMD.xml b/NeuroML2/LEMS_Sim_IClamp_RMD.xml
@@ -2,7 +2,7 @@
 
     <!-- 
 
-        This LEMS file has been automatically generated using PyNeuroML v1.2.12 (libNeuroML v0.5.9)
+        This LEMS file has been automatically generated using PyNeuroML v1.2.13 (libNeuroML v0.5.9)
 
      -->
 
@@ -18,8 +18,8 @@
     <Include file="IClamp_RMD.net.nml"/>
     <Include file="RMD.cell.nml"/>
 
-    <Simulation id="Sim_IClamp_RMD" length="1400.0ms" step="0.025ms" target="IClamp_RMD" seed="12345">  <!-- Note seed: ensures same random numbers used every run -->
-        <Display id="pop_RMD_v" title="Plots of pop_RMD_v" timeScale="1ms" xmin="-140.0" xmax="1540.0000000000002" ymin="-80" ymax="40">
+    <Simulation id="Sim_IClamp_RMD" length="1800.0ms" step="0.025ms" target="IClamp_RMD" seed="12345">  <!-- Note seed: ensures same random numbers used every run -->
+        <Display id="pop_RMD_v" title="Plots of pop_RMD_v" timeScale="1ms" xmin="-180.0" xmax="1980.0000000000002" ymin="-80" ymax="40">
             <Line id="pop_RMD_0_RMD_v" quantity="pop_RMD/0/RMD/v" scale="1mV" color="#d54f33" timeScale="1ms"/>
         </Display>
 

diff --git a/NeuroML2/RMD_cca.channel.nml b/NeuroML2/RMD_cca.channel.nml
@@ -34,7 +34,7 @@
         <Constant name="f3ca" dimension="none" value="1.7"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmcca1*(p1tmcca1/(exp((1/(f3ca*p3tmcca1))*(-V + p2tmcca1 - stmcca1)) + 1) + p4tmcca1))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmcca1*(p1tmcca1/(exp((1/(f3ca*p3tmcca1))*(-V + p2tmcca1 - stmcca1)) + 1) + p4tmcca1))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="cca_h_inf" extends="baseVoltageDepVariable">
@@ -60,7 +60,7 @@
         <Constant name="f4ca" dimension="none" value="1.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthcca1*(p1thcca1/(exp((1/(f4ca*p3thcca1))*(V - p2thcca1 + sthcca1)) + 1) + p4thcca1))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthcca1*(p1thcca1/(exp((1/(f4ca*p3thcca1))*(V - p2thcca1 + sthcca1)) + 1) + p4thcca1))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/RMD_egl36.channel.nml b/NeuroML2/RMD_egl36.channel.nml
@@ -32,7 +32,7 @@
         <Constant name="t1_egl36" dimension="none" value="355.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(t1_egl36)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(t1_egl36)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="egl36_m_m2_inf" extends="baseVoltageDepVariable">
@@ -50,7 +50,7 @@
         <Constant name="t2_egl36" dimension="none" value="63.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(t2_egl36)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(t2_egl36)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="egl36_m_m3_inf" extends="baseVoltageDepVariable">
@@ -68,7 +68,7 @@
         <Constant name="t3_egl36" dimension="none" value="13.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(t3_egl36)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(t3_egl36)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/RMD_kir.channel.nml b/NeuroML2/RMD_kir.channel.nml
@@ -27,7 +27,7 @@
         <Constant name="p6tmkir" dimension="none" value="3.8329"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(p1tmkir/(exp((-V + p2tmkir)/p3tmkir) + exp((V - p4tmkir)/p5tmkir)) + p6tmkir)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(p1tmkir/(exp((-V + p2tmkir)/p3tmkir) + exp((V - p4tmkir)/p5tmkir)) + p6tmkir)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/RMD_shak.channel.nml b/NeuroML2/RMD_shak.channel.nml
@@ -32,7 +32,7 @@
         <Constant name="shiftV05" dimension="none" value="0.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(ptmshak1/(exp((V - (ptmshak2 + shiftV05))/ptmshak3) + exp((-V + ptmshak2 + shiftV05)/ptmshak4)) + ptmshak5)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(ptmshak1/(exp((V - (ptmshak2 + shiftV05))/ptmshak3) + exp((-V + ptmshak2 + shiftV05)/ptmshak4)) + ptmshak5)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="shak_h_inf" extends="baseVoltageDepVariable">
@@ -51,7 +51,7 @@
         <Constant name="pthshak" dimension="none" value="1400.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(pthshak)/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(pthshak)* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/RMD_shal.channel.nml b/NeuroML2/RMD_shal.channel.nml
@@ -39,7 +39,7 @@
         <Constant name="cashal" dimension="none" value="0.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(cashal*(ptmshal1/(exp((-V + ptmshal2)/ptmshal3) + exp((V - ptmshal4)/ptmshal5)) + ptmshal6))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(cashal*(ptmshal1/(exp((-V + ptmshal2)/ptmshal3) + exp((V - ptmshal4)/ptmshal5)) + ptmshal6))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="shal_h_hf_inf" extends="baseVoltageDepVariable">
@@ -62,7 +62,7 @@
         <Constant name="cshal" dimension="none" value="0.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthfshal1/(exp((V - pthfshal2)/pthfshal3) + 1) + pthfshal4))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthfshal1/(exp((V - pthfshal2)/pthfshal3) + 1) + pthfshal4))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="shal_h_hs_inf" extends="baseVoltageDepVariable">
@@ -85,7 +85,7 @@
         <Constant name="cshal" dimension="none" value="0.1"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthsshal1/(exp((V - pthsshal2)/pthsshal3) + 1) + pthsshal4))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(cshal*(pthsshal1/(exp((V - pthsshal2)/pthsshal3) + 1) + pthsshal4))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>
diff --git a/NeuroML2/RMD_unc2.channel.nml b/NeuroML2/RMD_unc2.channel.nml
@@ -33,7 +33,7 @@
         <Constant name="constmunc2" dimension="none" value="3.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmunc2*(p1tmunc2/(exp((-V + p2tmunc2 - shiftmunc2)/p3tmunc2) + exp((V - p2tmunc2 + shiftmunc2)/p4tmunc2)) + p5tmunc2))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(constmunc2*(p1tmunc2/(exp((-V + p2tmunc2 - shiftmunc2)/p3tmunc2) + exp((V - p2tmunc2 + shiftmunc2)/p4tmunc2)) + p5tmunc2))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
     <ComponentType name="unc2_h_inf" extends="baseVoltageDepVariable">
@@ -59,7 +59,7 @@
         <Constant name="shifthunc2" dimension="none" value="30.0"/>
         <Dynamics>
             <DerivedVariable name="V" dimension="none" value="(v) / VOLT_SCALE"/>
-            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthunc2*(p1thunc2/(exp((V - p2thunc2 + shifthunc2)/p3thunc2) + 1) + p4thunc2/(exp((-V + p5thunc2 - shifthunc2)/p6thunc2) + 1)))/1000"/>
+            <DerivedVariable name="t" dimension="time" exposure="t" value="(consthunc2*(p1thunc2/(exp((V - p2thunc2 + shifthunc2)/p3thunc2) + 1) + p4thunc2/(exp((-V + p5thunc2 - shifthunc2)/p6thunc2) + 1)))* TIME_SCALE"/>
         </Dynamics>
     </ComponentType>
 </neuroml>