Bugfix fitted MC-SH model peak_directions.

AthenaEPI · Jan 28, 2019 · 178e8ba · 178e8ba
1 parent 0e49180
commit 178e8ba
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/dmipy/core/fitted_modeling_framework.py b/dmipy/core/fitted_modeling_framework.py
@@ -672,9 +672,9 @@ def peaks_directions(self, sphere, max_peaks=5,
                 fod, sphere, relative_peak_threshold, min_separation_angle)
             # if less peaks than max_peaks are found, only take those.
             Npeaks = np.min([len(indices_), max_peaks])
-            peaks[pos, :Npeaks] = peaks_[:Npeaks]
-            values[pos, :Npeaks] = values_[:Npeaks]
-            indices[pos, :Npeaks] = indices_[:Npeaks]
+            peaks[pos][:Npeaks] = peaks_[:Npeaks]
+            values[pos][:Npeaks] = values_[:Npeaks]
+            indices[pos][:Npeaks] = indices_[:Npeaks]
         return peaks, values, indices
 
     def anisotropy_index(self):

diff --git a/dmipy/core/modeling_framework.py b/dmipy/core/modeling_framework.py
@@ -19,8 +19,6 @@
     FittedMultiCompartmentModel,
     FittedMultiCompartmentSphericalMeanModel,
     FittedMultiCompartmentSphericalHarmonicsModel)
-from ..utils.construct_observation_matrix import (
-    construct_model_based_A_matrix)
 from ..optimizers.brute2fine import (
     GlobalBruteOptimizer, Brute2FineOptimizer)
 from ..optimizers_fod.csd_tournier import CsdTournierOptimizer