Merge branch 'master' into experimental

OpenSourceBrain · Aug 19, 2024 · 5bc289f · 5bc289f
2 parents cf02425 + ebd1d5d
commit 5bc289f
Show file tree

Hide file tree

Showing 11 changed files with 43 additions and 43 deletions.
diff --git a/NeuroML2/ConnectionsTest.net.nml b/NeuroML2/ConnectionsTest.net.nml
@@ -1,9 +1,9 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="ConnectionsTest">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="ConnectionsTest">
     <notes>
     This NeuroML 2 file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.8
-        pyNeuroML v1.1.14
+        PyNN v0.11.0
+        libNeuroML v0.6.3
+        pyNeuroML v1.3.7
     </notes>
     <IF_cond_alpha id="IF_cond_alpha_pop_pre" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="5.0" v_reset="-65.0" v_rest="-65.0" v_thresh="-50.0" e_rev_E="0.0" e_rev_I="-70.0"/>
     <IF_cond_alpha id="IF_cond_alpha_pop_post" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="5.0" v_reset="-65.0" v_rest="-65.0" v_thresh="-50.0" e_rev_E="0.0" e_rev_I="-70.0"/>
@@ -17,38 +17,38 @@
             <property tag="radius" value="5"/>
             <property tag="color" value="0 0.6 0"/>
             <instance id="0">
-                <location x="41.12765866873962" y="77.849455297045836" z="-33.682009571727953"/>
+                <location x="-9.771402205615921" y="41.107735197887862" z="8.380479496098125"/>
             </instance>
             <instance id="1">
-                <location x="24.434227084339511" y="68.73617121399451" z="50.090658409532821"/>
+                <location x="11.787241779479075" y="-22.917415323944468" z="-69.969358778846896"/>
             </instance>
             <instance id="2">
-                <location x="-71.418219691173974" y="-30.7712574921011" z="-8.906127091012506"/>
+                <location x="24.148166862976762" y="-10.126267539995236" z="-6.507356698049249"/>
             </instance>
             <instance id="3">
-                <location x="41.570399410983526" y="29.635511935195424" z="56.761427893603653"/>
+                <location x="-14.878199498615952" y="49.650874267039804" z="18.835272881150388"/>
             </instance>
             <instance id="4">
-                <location x="-48.171408056176233" y="6.763429120094999" z="-0.29940764736387"/>
+                <location x="37.92567221050809" y="-22.437678624311431" z="-38.190180651135641"/>
             </instance>
         </population>
         <population id="pop_post" component="IF_cond_alpha_pop_post" size="5" type="populationList">
             <property tag="radius" value="5"/>
             <property tag="color" value="0 0.2 0.6"/>
             <instance id="0">
-                <location x="33.545375762463017" y="167.030045862469905" z="26.387936726469885"/>
+                <location x="-30.357177121657621" y="148.821597074248928" z="41.550393258456353"/>
             </instance>
             <instance id="1">
-                <location x="-64.520990306567128" y="185.315473984196842" z="68.394588084493435"/>
+                <location x="-75.487951984450333" y="241.449664932469261" z="4.06371645195327"/>
             </instance>
             <instance id="2">
-                <location x="24.109891751889045" y="254.969724483040494" z="37.942890131910985"/>
+                <location x="53.196249421914075" y="144.47758109254687" z="46.851975572138628"/>
             </instance>
             <instance id="3">
-                <location x="39.187472616301264" y="166.933480864660993" z="76.627657875335473"/>
+                <location x="-20.844985362062317" y="188.239068673352108" z="-57.809991974759043"/>
             </instance>
             <instance id="4">
-                <location x="-54.192338767409673" y="124.413799909109613" z="3.670152241987878"/>
+                <location x="41.000859853632619" y="279.306766456403295" z="35.048479751214437"/>
             </instance>
         </population>
         <projection id="pop_pre__TO__pop_post" presynapticPopulation="pop_pre" postsynapticPopulation="pop_post" synapse="syn__pop_pre__TO__pop_post">

diff --git a/NeuroML2/Inputs.net.nml b/NeuroML2/Inputs.net.nml
@@ -1,9 +1,9 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="Inputs">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="Inputs">
     <notes>
     This NeuroML 2 file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.8
-        pyNeuroML v1.1.14
+        PyNN v0.11.0
+        libNeuroML v0.6.3
+        pyNeuroML v1.3.7
     </notes>
     <pulseGenerator id="DCSource_DCSource_0" delay="50.0ms" duration="350.0ms" amplitude="0.9nA"/>
     <compoundInput id="ACSource_ACSource_1">

diff --git a/NeuroML2/LEMS_Sim_Inputs.xml b/NeuroML2/LEMS_Sim_Inputs.xml
@@ -2,9 +2,9 @@
 
     <!-- 
     This LEMS file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.8
-        pyNeuroML v1.1.14
+        PyNN v0.11.0
+        libNeuroML v0.6.3
+        pyNeuroML v1.3.7
      -->
 
     <!-- Specify which component to run -->

diff --git a/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml b/NeuroML2/LEMS_Sim_PyNN_NeuroML2_Export.xml
@@ -2,9 +2,9 @@
 
     <!-- 
     This LEMS file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.8
-        pyNeuroML v1.1.14
+        PyNN v0.11.0
+        libNeuroML v0.6.3
+        pyNeuroML v1.3.7
      -->
 
     <!-- Specify which component to run -->

diff --git a/NeuroML2/Positions.net.nml.h5 b/NeuroML2/Positions.net.nml.h5
diff --git a/NeuroML2/PyNN_NeuroML2_Export.net.nml b/NeuroML2/PyNN_NeuroML2_Export.net.nml
@@ -1,9 +1,9 @@
-<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.xsd" id="PyNN_NeuroML2_Export">
+<neuroml xmlns="http://www.neuroml.org/schema/neuroml2"  xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.neuroml.org/schema/neuroml2 https://raw.github.com/NeuroML/NeuroML2/development/Schemas/NeuroML2/NeuroML_v2.3.1.xsd" id="PyNN_NeuroML2_Export">
     <notes>
     This NeuroML 2 file has been generated from: 
-        PyNN v0.10.1
-        libNeuroML v0.5.8
-        pyNeuroML v1.1.14
+        PyNN v0.11.0
+        libNeuroML v0.6.3
+        pyNeuroML v1.3.7
     </notes>
     <IF_curr_alpha id="IF_curr_alpha_pop_IF_curr_alpha" cm="1.0" i_offset="0.9" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="10.0" v_reset="-62.0" v_rest="-65.0" v_thresh="-52.0"/>
     <IF_curr_exp id="IF_curr_exp_pop_IF_curr_exp" cm="1.0" i_offset="1.0" tau_syn_E="2.0" tau_syn_I="5.0" v_init="-65.0" tau_m="20.0" tau_refrac="8.0" v_reset="-70.0" v_rest="-65.0" v_thresh="-50.0"/>

diff --git a/PyNN/LEMS_2007One_pynn.py b/PyNN/LEMS_2007One_pynn.py
@@ -9,9 +9,9 @@
 
 
     This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.10.0
-         org.neuroml.model   v1.10.0
-         jLEMS               v0.11.0
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 '''
 # Main PyNN script for: net1

diff --git a/PyNN/RS.mod b/PyNN/RS.mod
@@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS type=izhikevich2007Cell)
 COMMENT
 
     This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.10.0
-         org.neuroml.model   v1.10.0
-         jLEMS               v0.11.0
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 ENDCOMMENT
 

diff --git a/PyNN/RS_Iext.mod b/PyNN/RS_Iext.mod
@@ -3,9 +3,9 @@ TITLE Mod file for component: Component(id=RS_Iext type=pulseGenerator)
 COMMENT
 
     This NEURON file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.10.0
-         org.neuroml.model   v1.10.0
-         jLEMS               v0.11.0
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 ENDCOMMENT
 

diff --git a/PyNN/RS_Iext_inputdefinition.py b/PyNN/RS_Iext_inputdefinition.py
@@ -9,9 +9,9 @@
 ---------------------------------------------
 
     This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.10.0
-         org.neuroml.model   v1.10.0
-         jLEMS               v0.11.0
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 '''
 # Input file for Component: RS_Iext

diff --git a/PyNN/RS_celldefinition.py b/PyNN/RS_celldefinition.py
@@ -16,9 +16,9 @@
 ---------------------------------------------
 
     This PyNN file has been generated by org.neuroml.export (see https://github.com/NeuroML/org.neuroml.export)
-         org.neuroml.export  v1.10.0
-         org.neuroml.model   v1.10.0
-         jLEMS               v0.11.0
+         org.neuroml.export  v1.10.1
+         org.neuroml.model   v1.10.1
+         jLEMS               v0.11.1
 
 '''
 # Cell file for Component: RS