siibra 0.4a86__tar.gz → 0.4a88__tar.gz

{siibra-0.4a86/siibra.egg-info → siibra-0.4a88}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: siibra
-Version: 0.4a86
+Version: 0.4a88
 Summary: siibra - Software interfaces for interacting with brain atlases
 Home-page: https://github.com/FZJ-INM1-BDA/siibra-python
 Author: Big Data Analytics Group, Forschungszentrum Juelich, Institute of Neuroscience and Medicine (INM-1)
@@ -25,6 +25,16 @@ Requires-Dist: nilearn
 Requires-Dist: typing-extensions; python_version < "3.8"
 Requires-Dist: filelock
 Requires-Dist: ebrains-drive>=0.6.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 |License| |PyPI version| |doi| |Python versions| |Documentation Status|
 

siibra-0.4a88/siibra/VERSION

@@ -0,0 +1 @@
+0.4a88

{siibra-0.4a86 → siibra-0.4a88}/siibra/commons.py

@@ -698,6 +698,7 @@ class Species(Enum):
     MACACA_MULATTA = 5
     MACACA_FUSCATA = 6
     CHLOROCEBUS_AETHIOPS_SABAEUS = 7
+    CALLITHRIX_JACCHUS = 8
 
     UNSPECIFIED_SPECIES = 999
 

{siibra-0.4a86 → siibra-0.4a88}/siibra/configuration/factory.py

@@ -460,6 +460,10 @@ class Factory:
             return volume_of_interest.LSFMVolumeOfInterest(
                 modality="Light Sheet Fluorescence Microscopy", **kwargs
             )
+        elif modality == "morphometry":
+            return volume_of_interest.MorphometryVolumeOfInterest(
+                modality="Morphometry", **kwargs
+            )
         else:
             raise ValueError(f"No method for building image section feature type {modality}.")
 

{siibra-0.4a86 → siibra-0.4a88}/siibra/features/anchor.py

@@ -146,24 +146,21 @@ class AnatomicalAnchor:
         """
         if concept not in self._assignments:
             matches: List[AnatomicalAssignment] = []
-            if isinstance(concept, Space):
-                if self.space == concept:
-                    matches.append(
-                        AnatomicalAssignment(self.space, concept, AssignmentQualification.EXACT)
-                    )
-            elif isinstance(concept, Region):
-                if concept.species in self.species:
-                    if any(_.matches(self._regionspec) for _ in concept) \
-                            or self.has_region_aliases:  # dramatic speedup, since decoding _regionspec is expensive
-                        for r in self.regions:
-                            matches.append(AnatomicalAnchor.match_regions(r, concept))
-                    if len(concept.root.find(self._regionspec)) == 0:
-                        # We perform the (quite expensive) location-to-region test
-                        # only if this anchor's regionspec is not known to the
-                        # parcellation of the query region. Otherwise we can rely
-                        # on the region-to-region test.
-                        if self.location is not None:
-                            matches.append(AnatomicalAnchor.match_location_to_region(self.location, concept))
+            if isinstance(concept, Space) and self.space == concept:
+                matches.append(
+                    AnatomicalAssignment(self.space, concept, AssignmentQualification.EXACT)
+                )
+            elif isinstance(concept, Region) and concept.species in self.species:
+                hierarchy_search = concept.root.find(self._regionspec)
+                if len(hierarchy_search) > 0 or self.has_region_aliases:  # dramatic speedup, since decoding _regionspec is expensive
+                    for r in self.regions:
+                        matches.append(AnatomicalAnchor.match_regions(r, concept))
+                if len(hierarchy_search) == 0 and self.location is not None:
+                    # We perform the (quite expensive) location-to-region test
+                    # only if this anchor's regionspec is not known to the
+                    # parcellation of the query region. Otherwise we can rely
+                    # on the region-to-region test.
+                    matches.append(AnatomicalAnchor.match_location_to_region(self.location, concept))
             elif isinstance(concept, Location):
                 if self.location is not None:
                     matches.append(AnatomicalAnchor.match_locations(self.location, concept))

{siibra-0.4a86 → siibra-0.4a88}/siibra/features/image/__init__.py

@@ -21,7 +21,8 @@ from .volume_of_interest import (
     MRIVolumeOfInterest,
     XPCTVolumeOfInterest,
     LSFMVolumeOfInterest,
-    DTIVolumeOfInterest
+    DTIVolumeOfInterest,
+    MorphometryVolumeOfInterest
     # SegmentedVolumeOfInterest
 )
 from .sections import CellbodyStainedSection

{siibra-0.4a86 → siibra-0.4a88}/siibra/features/image/volume_of_interest.py

@@ -79,6 +79,14 @@ class LSFMVolumeOfInterest(
     def __init__(self, modality, **kwargs):
         image.Image.__init__(self, **kwargs, modality=modality)
 
+class MorphometryVolumeOfInterest(
+    image.Image,
+    configuration_folder="features/images/vois/morphometry",
+    category="macrostructural"
+):
+    def __init__(self, modality, **kwargs):
+        image.Image.__init__(self, **kwargs, modality=modality)
+
 # class SegmentedVolumeOfInterest(
 #     image.Image,
 #     configuration_folder="features/images/vois/segmentation",

{siibra-0.4a86 → siibra-0.4a88/siibra.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: siibra
-Version: 0.4a86
+Version: 0.4a88
 Summary: siibra - Software interfaces for interacting with brain atlases
 Home-page: https://github.com/FZJ-INM1-BDA/siibra-python
 Author: Big Data Analytics Group, Forschungszentrum Juelich, Institute of Neuroscience and Medicine (INM-1)
@@ -25,6 +25,16 @@ Requires-Dist: nilearn
 Requires-Dist: typing-extensions; python_version < "3.8"
 Requires-Dist: filelock
 Requires-Dist: ebrains-drive>=0.6.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 |License| |PyPI version| |doi| |Python versions| |Documentation Status|
 

siibra-0.4a86/siibra/VERSION

@@ -1 +0,0 @@
-0.4a86