Merge pull request #126 from MechMicroMan/125-error-with-findgrains

Fix #125

Author: rhysgt

defdap/hrdic.py

@@ -938,8 +938,8 @@ def findGrains(self, algorithm=None, minGrainSize=10):
                 # Find grain by masking the native ebsd grain image with
                 # selected grain from the warped dic grain image. The modal
                 # value is the EBSD grain label.
-                modeId, _ = mode(self.ebsdMap.grains[warpedDicGrains == i + 1])
-                ebsd_grain_idx = modeId[0] - 1
+                modeId, _ = mode(self.ebsdMap.grains[warpedDicGrains == i + 1], keepdims=False)
+                ebsd_grain_idx = modeId - 1
                 self.ebsdGrainIds.append(ebsd_grain_idx)
                 self[i].ebsdGrainId = ebsd_grain_idx
                 self[i].ebsdGrain = self.ebsdMap[ebsd_grain_idx]

setup.py

@@ -53,7 +53,7 @@ def get_version():
     package_data={'defdap': ['slip_systems/*.txt']},
     python_requires='>=3.6',
     install_requires=[
-        'scipy',
+        'scipy>=1.9',
         'numpy',
         'matplotlib>=3.0.0',
         'scikit-image',