diff --git a/doc/python/morphology.rst b/doc/python/morphology.rst
index 6bf92faa18acb575148fae08c89fcebb74176fdf..972cf903b6a61e197ba2472f34ac1ac9c97d6338 100644
--- a/doc/python/morphology.rst
+++ b/doc/python/morphology.rst
@@ -315,47 +315,6 @@ Cable cell morphology
:param int i: branch index
:rtype: list
-.. _pyswc:
-
-.. py:function:: load_swc_arbor(filename)
-
- Loads the :class:`morphology` from an SWC file according to arbor's SWC specifications.
- (See the morphology concepts :ref:`page <morph-formats>` for more details).
-
- The samples in the SWC files are treated as the end points of segments, where a
- sample and its parent form a segment.
- The :py:attr:`tag <segment.tag>` of each segment is the
- `structure identifier <http://www.neuronland.org/NLMorphologyConverter/MorphologyFormats/SWC/Spec.html>`_
- of the distal sample.
- The structure identifier of the first (root) sample is ignored, as it can only be the
- proximal end of any segment.
-
- .. note::
- This method does not interpret the first sample, typically associated with the soma,
- as a sphere. SWC files with single point somas are common, for example
- `SONATA <https://github.com/AllenInstitute/sonata/blob/master/docs/SONATA_DEVELOPER_GUIDE.md#representing-biophysical-neuron-morphologies>`_
- model descriptions.
-
- Such representations are challenging to consistently interpret in different
- simulation tools because they require heuristics and, often undocumented, rules
- for how to interpret the connectin of axons and dendrites to the soma.
-
- The :func:`load_swc_neuron` function provides support for loading
- SWC files according to the interpretation used by NEURON.
-
-
- :param str filename: the name of the SWC file.
- :rtype: morphology
-
-.. py:function:: load_swc_neuron(filename)
-
- Loads the :class:`morphology` from an SWC file according to NEURON's ``Import3D``
- interpretation of the SWC specification.
- See :ref:`the SWC file documention <formatswc-neuron>` for more details.
-
- :param str filename: the name of the SWC file.
- :rtype: morphology
-
.. py:class:: place_pwlin
A :class:`place_pwlin` object allows the querying of the 3-d location of locations and cables
@@ -494,6 +453,21 @@ constitute part of the CV boundary point set.
:param str domain: The region on which the policy is applied.
+.. py:function:: cv_policy_explicit(locset, domain='(all)')
+
+ Use the provided locset as control volume boundaries.
+
+ .. code-block:: Python
+
+ # Place CV boundaries midway every branch.
+ midbranch_cvp = arbor.cv_policy_explicit('(on-branches 0.5)')
+
+ # Place CV boundaries at 10 random positions on the soma.
+ random_soma_cvp = arbor.cv_policy_explicit('(uniform (tag 3) 0 9 0)','"soma"')
+
+ :param str locset: The locset on which CV boundaries are placed.
+ :param str domain: The region on which the policy is applied.
+
.. py:function:: cv_policy_every_segment(domain='(all)')
Use every sample point in the morphology definition as a CV boundary, optionally
@@ -520,8 +494,55 @@ constitute part of the CV boundary point set.
:param float max_etent: The maximum length for generated CVs.
:param str domain: The region on which the policy is applied.
+.. _pyswc:
+
+SWC
+---
+
+.. py:function:: load_swc_arbor(filename)
+
+ Loads the :class:`morphology` from an SWC file according to arbor's SWC specifications.
+ (See the morphology concepts :ref:`page <morph-formats>` for more details).
+
+ The samples in the SWC files are treated as the end points of segments, where a
+ sample and its parent form a segment.
+ The :py:attr:`tag <segment.tag>` of each segment is the
+ `structure identifier <http://www.neuronland.org/NLMorphologyConverter/MorphologyFormats/SWC/Spec.html>`_
+ of the distal sample.
+ The structure identifier of the first (root) sample is ignored, as it can only be the
+ proximal end of any segment.
+
+ .. note::
+ This method does not interpret the first sample, typically associated with the soma,
+ as a sphere. SWC files with single point somas are common, for example
+ `SONATA <https://github.com/AllenInstitute/sonata/blob/master/docs/SONATA_DEVELOPER_GUIDE.md#representing-biophysical-neuron-morphologies>`_
+ model descriptions.
+
+ Such representations are challenging to consistently interpret in different
+ simulation tools because they require heuristics and, often undocumented, rules
+ for how to interpret the connectin of axons and dendrites to the soma.
+
+ The :func:`load_swc_neuron` function provides support for loading
+ SWC files according to the interpretation used by NEURON.
+
+
+ :param str filename: the name of the SWC file.
+ :rtype: morphology
+
+.. py:function:: load_swc_neuron(filename)
+
+ Loads the :class:`morphology` from an SWC file according to NEURON's ``Import3D``
+ interpretation of the SWC specification.
+ See :ref:`the SWC file documention <formatswc-neuron>` for more details.
+
+ :param str filename: the name of the SWC file.
+ :rtype: morphology
+
.. _pyneuroml:
+NeuroML
+-------
+
.. py:class:: neuroml_morph_data
A :class:`neuroml_morphology_data` object contains a representation of a morphology defined in
@@ -616,6 +637,9 @@ constitute part of the CV boundary point set.
.. _pyasc:
+Neurolucida
+-----------
+
.. py:class:: asc_morphology
The morphology and label dictionary meta-data loaded from a Neurolucida ASCII ``.asc`` file.
diff --git a/python/cells.cpp b/python/cells.cpp
index a9f7fabdbf2d2a93ef62f50bd88cdc85311a09c2..9b136b034596d3ea4a5da0802fdee15dffa644ee 100644
--- a/python/cells.cpp
+++ b/python/cells.cpp
@@ -78,6 +78,10 @@ arb::cv_policy make_cv_policy_single(const std::string& reg) {
return arb::cv_policy_single(reg);
}
+arb::cv_policy make_cv_policy_explicit(const std::string& locset, const std::string& reg) {
+ return arb::cv_policy_explicit(locset, reg);
+}
+
arb::cv_policy make_cv_policy_every_segment(const std::string& reg) {
return arb::cv_policy_every_segment(reg);
}
@@ -251,6 +255,12 @@ void register_cells(pybind11::module& m) {
.def("__repr__", [](const arb::cv_policy& p) {return "(cv-policy)";})
.def("__str__", [](const arb::cv_policy& p) {return "(cv-policy)";});
+ m.def("cv_policy_explicit",
+ &make_cv_policy_explicit,
+ "locset"_a, "the locset describing the desired CV boundaries",
+ "domain"_a="(all)", "the domain to which the policy is to be applied",
+ "Policy to create compartments at explicit locations.");
+
m.def("cv_policy_single",
&make_cv_policy_single,
"domain"_a="(all)", "the domain to which the policy is to be applied",