Skip to content

Commit

Permalink
Merge pull request #1 from OpenSourceBrain/master
Browse files Browse the repository at this point in the history
New changes for KAHP/SK2 channel
  • Loading branch information
RokasSt committed Dec 11, 2015
2 parents bb4e80b + 5245804 commit 87f2f83
Show file tree
Hide file tree
Showing 10 changed files with 151 additions and 37 deletions.
114 changes: 114 additions & 0 deletions NEURON/CaClamp.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
TITLE Mod file for component: Component(id=CaClamp type=caClamp)

COMMENT

This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
org.neuroml.export v1.4.3
org.neuroml.model v1.4.3
jLEMS v0.9.8.1

ENDCOMMENT

NEURON {
SUFFIX CaClamp
USEION ca READ cai, cao, ica WRITE cai VALENCE 2
RANGE cai
RANGE cao
GLOBAL initialConcentration
GLOBAL initialExtConcentration
RANGE conc0 : parameter
RANGE conc1 : parameter
RANGE delay : parameter
RANGE duration : parameter

}

UNITS {

(nA) = (nanoamp)
(uA) = (microamp)
(mA) = (milliamp)
(A) = (amp)
(mV) = (millivolt)
(mS) = (millisiemens)
(uS) = (microsiemens)
(molar) = (1/liter)
(kHz) = (kilohertz)
(mM) = (millimolar)
(um) = (micrometer)
(umol) = (micromole)
(S) = (siemens)

}

PARAMETER {
surfaceArea (um2)
iCa (nA)
initialConcentration (mM)
initialExtConcentration (mM)

conc0 = 5.0E-5 (mM)
conc1 = 0.005 (mM)
delay = 200 (ms)
duration = 200 (ms)
}

ASSIGNED {
cai (mM)
cao (mM)
ica (mA/cm2)
diam (um)
area (um2)

}

STATE {
concentration (mM)
extConcentration (mM)

}

INITIAL {
initialConcentration = cai
initialExtConcentration = cao
rates()
rates() ? To ensure correct initialisation.

concentration = initialConcentration

extConcentration = initialExtConcentration

}

BREAKPOINT {

rates()
if (t <= delay) {
concentration = conc0 ? standard OnCondition
}

if (t >= delay && t <= duration + delay) {
concentration = conc1 ? standard OnCondition
}

if (t >= duration + delay) {
concentration = conc0 ? standard OnCondition
}


cai = concentration


}

PROCEDURE rates() {

surfaceArea = area : surfaceArea has units (um2), area (built in to NEURON) is in um^2...

iCa = -1 * (0.01) * ica * surfaceArea : iCa has units (nA) ; ica (built in to NEURON) has units (mA/cm2)...




}

File renamed without changes.
4 changes: 2 additions & 2 deletions NEURON/.test.neuron.omt → NEURON/test/.test.neuron.omt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Script for running automated tests on OSB using Travis-CI, see https://github.com/OpenSourceBrain/osb-model-validation

target: Test_golgi.hoc
target: ../Test_golgi.hoc
engine: NEURON

mep: .test.mep
Expand All @@ -9,7 +9,7 @@ experiments:
observables:
spike times:
file:
path: Soma.dat
path: ../Soma.dat
columns: [0,1]
scaling: [1, 1]
spike detection:
Expand Down
21 changes: 10 additions & 11 deletions NEURON/test/Test_SK2.hoc
Original file line number Diff line number Diff line change
Expand Up @@ -7,30 +7,29 @@ usegui = 1
create Soma
access Soma

celsius = 6.3
celsius = 23

Soma {pt3dclear() pt3dadd(0.0, 0, 0.0, 13.4715) pt3dadd(0.0, 23.1694, 0.0, 13.4715)}
Soma {pt3dclear() pt3dadd(0.0, 0, 0.0, 27) pt3dadd(0.0, 27, 0.0, 27)}
define_shape()

forall Ra = 100

insert Golgi_lkg

insert Golgi_Ca_HVA
glbar_Golgi_lkg=2.1e-05

insert Golgi_SK2

insert Golgi_CALC
insert CaClamp

proc initialiseValues0() {

forall v = -63
forall v = -65

}

objref fih0
{fih0 = new FInitializeHandler(0, "initialiseValues0()")}

/*
objref stim1
objref stim2

Expand All @@ -45,11 +44,11 @@ Soma {
stim2.del = 800.0
stim2.dur = 200.0
stim2.amp = 0.04
}
}*/



tstop = 1500.0
tstop = 600.0
dt = 0.01


Expand Down Expand Up @@ -91,7 +90,7 @@ if (usegui==1) {
{GraphWin_1.view(0, -0.1, tstop, 1.2, 80, 330, 330, 250)}
{
GraphWin_1.addexpr("o1", "Soma.o1_Golgi_SK2", 1, 1, 0.8, 0.9, 2)
GraphWin_1.addexpr("o1", "Soma.o2_Golgi_SK2", 2, 1, 0.8, 0.9, 2)
GraphWin_1.addexpr("o2", "Soma.o2_Golgi_SK2", 2, 1, 0.8, 0.9, 2)
GraphWin_1.addexpr("c1", "Soma.c1_Golgi_SK2", 3, 1, 0.8, 0.9, 2)
GraphWin_1.addexpr("c2", "Soma.c2_Golgi_SK2", 4, 1, 0.8, 0.9, 2)
GraphWin_1.addexpr("c3", "Soma.c3_Golgi_SK2", 5, 1, 0.8, 0.9, 2)
Expand Down Expand Up @@ -149,7 +148,7 @@ if (usegui==1) {
xbutton("Stop","stoprun=1")
t = 0
xvalue("t","t", 2 )
tstop = 700.0
tstop = 600.0
xvalue("Tstop","tstop", 1,"tstop_changed()", 0, 1 )
dt = 0.01
xvalue("dt","dt", 1,"setdt()", 0, 1 )
Expand Down
4 changes: 2 additions & 2 deletions NeuroML2/CaClamp.nml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2beta4.xsd"
id="CaClamp">

<caClamp id="CaClamp" conc0="5e-11mol_per_cm3" conc1="5e-9mol_per_cm3" delay="200.0ms" duration="200.0ms" species="ca"/>
<caClamp id="CaClamp" conc0="5e-11mol_per_cm3" conc1="5e-9mol_per_cm3" delay="200.0ms" duration="200.0ms" ion="ca"/>


<ComponentType name="caClamp" extends="concentrationModel" description="Model of ca conc which can be held at different values for a specific duration">
Expand All @@ -17,7 +17,7 @@



<Text name="species"/>
<Text name="ion"/>

<Dynamics>

Expand Down
19 changes: 10 additions & 9 deletions NeuroML2/LEMS_KAHP_Test.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<Include file="KAHP_CML.channel.nml"/>

<Include file="LeakCond.channel.nml"/>
<Include file="Golgi_CALC_CML.nml"/>

<Include file="CaClamp.nml"/>

<!-- Cell files-->
Expand All @@ -31,13 +31,13 @@
</Display>

<Display id="GraphWin_0" title="Soma channels" xmin="-60.0" xmax="660.0" ymin="-0.1" ymax="1.1" timeScale="1ms">
<Line id="o1" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o1/occupancy" scale="1" color="#FF0000"/>
<Line id="o2" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o2/occupancy" scale="1" color="#FFFF00"/>
<Line id="o1" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o1/occupancy" scale="1" color="#000000"/>
<Line id="o2" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o2/occupancy" scale="1" color="#FF0000"/>

<Line id="c1" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c1/occupancy" scale="1" color="#FFFFFF"/>
<Line id="c2" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c2/occupancy" scale="1" color="#ccccFF"/>
<Line id="c3" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c3/occupancy" scale="1" color="#9999FF"/>
<Line id="c4" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c4/occupancy" scale="1" color="#4444FF"/>
<Line id="c1" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c1/occupancy" scale="1" color="#0000ff"/>
<Line id="c2" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c2/occupancy" scale="1" color="#00ff00"/>
<Line id="c3" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c3/occupancy" scale="1" color="#ff6600"/>
<Line id="c4" timeScale="1ms" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c4/occupancy" scale="1" color="#7a5230"/>
</Display>

<Display id="CG_conc" title="Soma [Ca2+]" xmin="-60" xmax="660" ymin="-0.0006" ymax="0.006" timeScale="1ms">
Expand All @@ -52,13 +52,14 @@
</OutputFile>

<OutputFile id="states" fileName="KAHP.states.dat">
<OutputColumn id="o1" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o1/occupancy"/>
<OutputColumn id="o2" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o2/occupancy"/>

<OutputColumn id="c1" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c1/occupancy"/>
<OutputColumn id="c2" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c2/occupancy"/>
<OutputColumn id="c3" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c3/occupancy"/>
<OutputColumn id="c4" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/c4/occupancy"/>

<OutputColumn id="o1" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o1/occupancy"/>
<OutputColumn id="o2" quantity="CG_Test/0/TestKAHP/biophys/membraneProperties/KAHP_CML_all/KAHP_CML/n/o2/occupancy"/>
</OutputFile>


Expand Down
20 changes: 9 additions & 11 deletions NeuroML2/TestKAHP.cell.nml
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,6 @@
xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.githubusercontent.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2beta4.xsd"
id="TestKAHP">

<include href="KAHP_CML.channel.nml"/>

<include href="LeakCond.channel.nml"/>


Expand All @@ -15,8 +13,8 @@
<morphology id="morphology_Simple_CML_test">

<segment id="0" name="Soma">
<proximal x="0.0" y="0.0" z="0.0" diameter="11.0"/>
<distal x="0.0" y="37.766" z="0.0" diameter="11.0"/>
<proximal x="0.0" y="0.0" z="0.0" diameter="27"/>
<distal x="0.0" y="27" z="0.0" diameter="27"/>
</segment>

<segmentGroup id="Soma" neuroLexId="sao864921383"> <!--
Expand Down Expand Up @@ -45,13 +43,13 @@

<membraneProperties>

<channelDensity condDensity="0.025 mS_per_cm2" id="LeakCond_all" ionChannel="LeakCond" erev="-55.0 mV" ion="non_specific"/>
<channelDensity condDensity="1.0 mS_per_cm2" id="KAHP_CML_all" ionChannel="KAHP_CML" ion="k" erev="-84.69 mV"/>
<channelDensity condDensity="0.021 mS_per_cm2" id="LeakCond_all" ionChannel="LeakCond" erev="-55.0 mV" ion="non_specific"/>

<channelDensity condDensity="0.038 mS_per_cm2" id="KAHP_CML_all" ionChannel="KAHP_CML" ion="k" erev="-84.69 mV"/>

<!--
<!--
<channelDensity condDensity="36.0 mS_per_cm2" id="KAHP_CML_all" ionChannel="KAHP_CML" ion="k" erev="-84.69 mV"/>
<channelDensity condDensity="32.0 mS_per_cm2" id="KV_CML_all" ionChannel="KV_CML" ion="k" erev="-84.69 mV"/>
Expand All @@ -66,7 +64,7 @@

<spikeThresh value="0 mV"/>

<specificCapacitance value="0.9 uF_per_cm2"/>
<specificCapacitance value="1 uF_per_cm2"/>

<initMembPotential value="-65.0 mV"/>

Expand All @@ -84,4 +82,4 @@

</cell>

</neuroml>
</neuroml>
2 changes: 1 addition & 1 deletion NeuroML2/TestKAHP.net.nml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<pulseGenerator id="Input_3" delay="100.0ms" duration="100.0ms" amplitude="-1.0E-5uA"/>


<network id="network_Soma" type="networkWithTemperature" temperature="34 degC">
<network id="network_Soma" type="networkWithTemperature" temperature="23 degC">



Expand Down
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,3 +10,5 @@ Based on implementation in NEURON taken from: http://senselab.med.yale.edu/model

For more information see
http://www.opensourcebrain.org/projects/cerebellum--cerebellar-golgi-cell--solinasetal-golgicell

[![Build Status](https://travis-ci.org/OpenSourceBrain/SolinasEtAl-GolgiCell.svg)](https://travis-ci.org/OpenSourceBrain/SolinasEtAl-GolgiCell)
2 changes: 1 addition & 1 deletion neuroConstruct/pythonScripts/RunTestsPace.py
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@


spike_times = []
mep_file = open('../../NEURON/.test.mep')
mep_file = open('../../NEURON/test/.test.mep')
for line in mep_file:
line = line.strip()
if line.startswith('spike times: ['):
Expand Down

0 comments on commit 87f2f83

Please sign in to comment.