bluecellulab 2.6.0__py3-none-any.whl → 2.6.1__py3-none-any.whl

bluecellulab/cell/core.py

@@ -497,10 +497,6 @@ class Cell(InjectableMixin, PlottableMixin):
         # numpy int to int
         post_sec_id = int(syn_description[SynapseProperty.POST_SECTION_ID])
 
-        location = SynapseFactory.determine_synapse_location(
-            syn_description, self
-        )
-
         weight_scalar = connection_modifiers.get('Weight', 1.0)
         exc_mini_frequency, inh_mini_frequency = mini_frequencies \
             if mini_frequencies is not None else (None, None)
@@ -516,13 +512,15 @@ class Cell(InjectableMixin, PlottableMixin):
             spont_minis_rate = inh_mini_frequency
 
         if spont_minis_rate is not None and spont_minis_rate > 0:
-            sec = self.get_psection(post_sec_id).hsection
+            synapse_hoc_args = SynapseFactory.determine_synapse_location(
+                syn_description, self
+            )
             # add the *minis*: spontaneous synaptic events
             self.ips[synapse_id] = neuron.h.\
-                InhPoissonStim(location, sec=sec)
+                InhPoissonStim(synapse_hoc_args.location, sec=synapse_hoc_args.section)
 
             self.syn_mini_netcons[synapse_id] = neuron.h.\
-                NetCon(self.ips[synapse_id], synapse.hsynapse, sec=sec)
+                NetCon(self.ips[synapse_id], synapse.hsynapse, sec=synapse_hoc_args.section)
             self.syn_mini_netcons[synapse_id].delay = 0.1
             self.syn_mini_netcons[synapse_id].weight[0] = weight * weight_scalar
             # set netcon type

bluecellulab/circuit/synapse_properties.py

@@ -40,6 +40,7 @@ class SynapseProperty(Enum):
     NRRP = "NRRP"
     U_HILL_COEFFICIENT = "u_hill_coefficient"
     CONDUCTANCE_RATIO = "conductance_scale_factor"
+    AFFERENT_SECTION_POS = "afferent_section_pos"
 
     @classmethod
     def from_bluepy(cls, prop: BLPSynapse) -> SynapseProperty:
@@ -76,6 +77,7 @@ class SynapseProperties:
         SynapseProperty.NRRP,
         SynapseProperty.U_HILL_COEFFICIENT,
         SynapseProperty.CONDUCTANCE_RATIO,
+        SynapseProperty.AFFERENT_SECTION_POS,
     )
     plasticity = (
         "volume_CR", "rho0_GB", "Use_d_TM", "Use_p_TM", "gmax_d_AMPA",
@@ -98,6 +100,7 @@ snap_to_synproperty = MappingProxyType({
     "n_rrp_vesicles": SynapseProperty.NRRP,
     "u_hill_coefficient": SynapseProperty.U_HILL_COEFFICIENT,
     "conductance_scale_factor": SynapseProperty.CONDUCTANCE_RATIO,
+    "afferent_section_pos": SynapseProperty.AFFERENT_SECTION_POS,
 })
 
 
@@ -148,11 +151,16 @@ def properties_from_bluepy(
 def properties_to_bluepy(props: list[SynapseProperty | str]) -> list[BLPSynapse | str]:
     """Convert a list of SynapseProperty to bluepy Synapse properties, spare
     'str's."""
+    # bluepy does not have AFFERENT_SECTION_POS atm.
+    # jira_url/project/issues/browse/NSETM-2313
+    bluepy_recognised_props = props.copy()
+    if SynapseProperty.AFFERENT_SECTION_POS in bluepy_recognised_props:
+        bluepy_recognised_props.remove(SynapseProperty.AFFERENT_SECTION_POS)
     return [
         prop.to_bluepy()
         if isinstance(prop, SynapseProperty)
         else prop
-        for prop in props
+        for prop in bluepy_recognised_props
     ]
 
 

{bluecellulab-2.6.0.dist-info → bluecellulab-2.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: bluecellulab
-Version: 2.6.0
+Version: 2.6.1
 Summary: Biologically detailed neural network simulations and analysis.
 Author: Blue Brain Project, EPFL
 License: Apache2.0

{bluecellulab-2.6.0.dist-info → bluecellulab-2.6.1.dist-info}/RECORD

@@ -18,7 +18,7 @@ bluecellulab/analysis/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3h
 bluecellulab/analysis/inject_sequence.py,sha256=qr3N1tQX4avvKzFBT0L7W6LnSgk2y_P_7Yhy0UjlGmk,4769
 bluecellulab/cell/__init__.py,sha256=Sbc0QOsJ8E7tSwf3q7fsXuE_SevBN6ZmoCVyyU5zfII,208
 bluecellulab/cell/cell_dict.py,sha256=PVmZsjhZ9jp3HC-8QmdFqp-crAcVMSVeLWujcOPLlpo,1346
-bluecellulab/cell/core.py,sha256=MtrVQAxT82dc9uQuWZyTQfc6Oczrnc_y_9hcyBqUT7w,31467
+bluecellulab/cell/core.py,sha256=ZVzy3tsA5X7OyCmnHQn0d6AlNg9rOG2ojKuojvKdsFw,31487
 bluecellulab/cell/injector.py,sha256=XC49VSHw78xCHzLJKO_-unnnVZAZXsYg5qbmZPx01AA,18091
 bluecellulab/cell/plotting.py,sha256=hW5KAmaSonJ1tgR6xRrnfVe33I5mBsBUrKJQwGvAbUc,4032
 bluecellulab/cell/random.py,sha256=FDby9BN4eJT27COwHP59bhDE2v-c6rdOKNFj3cYZTVY,1773
@@ -36,7 +36,7 @@ bluecellulab/circuit/format.py,sha256=eYhiBIQnPnnVBmaSDymFjQprXN9QjEYKmFhb2mIS86
 bluecellulab/circuit/iotools.py,sha256=KVE7x5LNQ4RgjNh05Q-h3Swpbs3nRFtrcWNHj62aiRI,1585
 bluecellulab/circuit/node_id.py,sha256=gaRAW3UhbPOPsoXMHLjo3qH9iNod7YB8ZOcguWprrU4,1265
 bluecellulab/circuit/simulation_access.py,sha256=QHVEN-sEZbCCvblhBHEShGX0-NEXCD1AYpavpVGCgAE,7073
-bluecellulab/circuit/synapse_properties.py,sha256=6PpMWeothomR2c-mx63yVIISJc4eSL9xMnaIM2nryNM,5494
+bluecellulab/circuit/synapse_properties.py,sha256=tF2vfYVKtyS6hWrk_hHmvdUQvXIlZi8ZY0Vcci0-_sA,5967
 bluecellulab/circuit/validate.py,sha256=7EUN15u0JFFlLf389jUBqLwDOHyZdfKtoidI-xLUVYA,3593
 bluecellulab/circuit/circuit_access/__init__.py,sha256=sgp6m5kP-pq60V1IFGUiSUR1OW01zdxXNNUJmPA8anI,201
 bluecellulab/circuit/circuit_access/bluepy_circuit_access.py,sha256=HxQaRTz1HaeOVV87fiptJBXRNWCitT-5YHn71WtSsLg,14687
@@ -62,9 +62,9 @@ bluecellulab/stimulus/factory.py,sha256=cjnMqFx-Y31kV1XHvkSbGI2f1OpEawU3Wg_cLqcI
 bluecellulab/synapse/__init__.py,sha256=RW8XoAMXOvK7OG1nHl_q8jSEKLj9ZN4oWf2nY9HAwuk,192
 bluecellulab/synapse/synapse_factory.py,sha256=YkvxbdGF-u-vxYdbRNTlX-9AtSC_3t_FQRFhybwzgrk,6805
 bluecellulab/synapse/synapse_types.py,sha256=4gne-hve2vq1Lau-LAVPsfLjffVYqAYBW3kCfC7_600,16871
-bluecellulab-2.6.0.dist-info/AUTHORS.txt,sha256=EDs3H-2HXBojbma10psixk3C2rFiOCTIREi2ZAbXYNQ,179
-bluecellulab-2.6.0.dist-info/LICENSE,sha256=xOouu1gC1GGklDxkITlaVl60I9Ab860O-nZsFbWydvU,11749
-bluecellulab-2.6.0.dist-info/METADATA,sha256=X-XmGZmXo-FZIe6H5r0qIs-VBJnTN0zNVOXNVuiLW0M,7025
-bluecellulab-2.6.0.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-bluecellulab-2.6.0.dist-info/top_level.txt,sha256=VSyEP8w9l3pXdRkyP_goeMwiNA8KWwitfAqUkveJkdQ,13
-bluecellulab-2.6.0.dist-info/RECORD,,
+bluecellulab-2.6.1.dist-info/AUTHORS.txt,sha256=EDs3H-2HXBojbma10psixk3C2rFiOCTIREi2ZAbXYNQ,179
+bluecellulab-2.6.1.dist-info/LICENSE,sha256=xOouu1gC1GGklDxkITlaVl60I9Ab860O-nZsFbWydvU,11749
+bluecellulab-2.6.1.dist-info/METADATA,sha256=jQkc9kIE0mWCM6BNhdQaFA-bP-Enl_6NFyeelVMvq9E,7025
+bluecellulab-2.6.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+bluecellulab-2.6.1.dist-info/top_level.txt,sha256=VSyEP8w9l3pXdRkyP_goeMwiNA8KWwitfAqUkveJkdQ,13
+bluecellulab-2.6.1.dist-info/RECORD,,