Skip to content

ionchannelKS children name clash; (minor) child/children for notes/annotations #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: development
Choose a base branch
from
Open

ionchannelKS children name clash; (minor) child/children for notes/annotations #87

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
ed428e9
child annotation/notes -> children (optional)
borismarin Apr 6, 2016
24a13b5
children name collision (gates) for ionChannelKS
borismarin Apr 6, 2016
da21e14
Merge pull request #88 from NeuroML/borismarin-patch-1-1
borismarin Apr 6, 2016
9c9516d
corrected path for gatesKS
borismarin Apr 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 15 additions & 15 deletions NeuroML2CoreTypes/Channels.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
extends="gate"
description="Gate which follows the general Hodgkin Huxley formalism">

<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>

<Child name="forwardRate" type="baseVoltageDepRate"/>
<Child name="reverseRate" type="baseVoltageDepRate"/>
Expand Down Expand Up @@ -269,7 +269,7 @@
extends="gate"
description="Gate which follows the general Hodgkin Huxley formalism">

<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>

<Child name="timeCourse" type="baseVoltageDepTime" />
<Child name="steadyState" type="baseVoltageDepVariable" />
Expand Down Expand Up @@ -307,7 +307,7 @@

<Constant name="SEC" dimension="time" value="1 s"/>

<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>

<Child name="steadyState" type="baseVoltageDepVariable" />

Expand All @@ -332,7 +332,7 @@
extends="gate"
description="Gate which follows the general Hodgkin Huxley formalism">

<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>

<Child name="forwardRate" type="baseVoltageDepRate"/>
<Child name="reverseRate" type="baseVoltageDepRate"/>
Expand Down Expand Up @@ -376,7 +376,7 @@
extends="gate"
description="Gate which follows the general Hodgkin Huxley formalism">

<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>

<Child name="forwardRate" type="baseVoltageDepRate"/>
<Child name="reverseRate" type="baseVoltageDepRate"/>
Expand Down Expand Up @@ -416,7 +416,7 @@
extends="gate"
description="Gate which follows the general Hodgkin Huxley formalism">

<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>

<Child name="forwardRate" type="baseVoltageDepRate"/>
<Child name="reverseRate" type="baseVoltageDepRate"/>
Expand Down Expand Up @@ -472,7 +472,7 @@
<ComponentType name="subGate"
description="Gate composed of subgates contributing with fractional conductance">

<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>

<Child name="timeCourse" type="baseVoltageDepTime" />
<Child name="steadyState" type="baseVoltageDepVariable" />
Expand Down Expand Up @@ -511,8 +511,8 @@
<ComponentType name="ionChannelPassive"
extends="ionChannel"
description="Simple passive ion channel where the constant conductance through the channel is equal to _conductance">
<Child name="notes" type="notes"/>
<Child name="annotation" type="annotation"/>
<Children name="notes" type="notes"/>
<Children name="annotation" type="annotation"/>
<Text name="neuroLexId"/>

<Dynamics>
Expand All @@ -525,8 +525,8 @@
<ComponentType name="ionChannelHH"
extends="baseIonChannel"
description="Note _ionChannel_ and _ionChannelHH_ are currently functionally identical. This is needed since many existing examples use ionChannel, some use ionChannelHH. NeuroML v2beta4 should remove one of these, probably ionChannelHH.">
<Child name="notes" type="notes"/>
<Child name="annotation" type="annotation"/>
<Children name="notes" type="notes"/>
<Children name="annotation" type="annotation"/>

<Children name="conductanceScaling" type="baseConductanceScaling"/>
<Children name="gates" type="gate"/>
Expand Down Expand Up @@ -560,7 +560,7 @@
<ComponentType name="KSState"
description="One of the states in which a _gateKS_ can be. The rates of transitions between these states are given by _KSTransition_s">
<Parameter name="relativeConductance" dimension="none"/>
<Child name="notes" type="notes"/>
<Children name="notes" type="notes"/>
<Exposure name="occupancy" dimension="none"/>
<Exposure name="q" dimension="none"/>

Expand Down Expand Up @@ -588,12 +588,12 @@
<ComponentType name="ionChannelKS"
extends="ionChannel"
description="A kinetic scheme based ion channel with multiple _gateKS_s, each of which consists of multiple _KSState_s and _KSTransition_s giving the rates of transition between them">
<Children name="gates" type="gateKS"/>
<Children name="gatesKS" type="gateKS"/>

<Text name="species"/>

<Dynamics>
<DerivedVariable name="fopen" exposure="fopen" dimension="none" select="gates[*]/fcond" reduce="multiply"/>
<DerivedVariable name="fopen" exposure="fopen" dimension="none" select="gatesKS[*]/fcond" reduce="multiply"/>
<DerivedVariable name="g" exposure="g" dimension="conductance" value="fopen * conductance"/>

</Dynamics>
Expand Down Expand Up @@ -684,7 +684,7 @@


<ComponentType name="gateKS"
extends="baseGate"
extends="gate"
description="A gate which consists of multiple _KSState_s and _KSTransition_s giving the rates of transition between them">
<Children name="states" type="KSState"/>
<Children name="transitions" type="KSTransition"/>
Expand Down