FIX: feGet fixed to support multi and single b value. Few changes in …

…SHT packages too
ccaiafa · Dec 28, 2016 · 42715ea · 42715ea
1 parent 3eeffa5
commit 42715ea
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 11 deletions.
diff --git a/external/Spherical-Harmonic-Transform-master/leastSquaresSHT.m b/external/Spherical-Harmonic-Transform-master/leastSquaresSHT.m
@@ -1,4 +1,4 @@
-function [F_N, Y_N] = leastSquaresSHT(N, F, dirs, basisType, weights)
+function [F_N, Y_N, error] = leastSquaresSHT(N, F, dirs, basisType, weights)
 %LEASTSQUARESSHT Spherical harmonic transform of F using least-squares
 %
 %   N:  maximum order of transform
@@ -35,6 +35,7 @@
         % perform weighted least-squares transform
         F_N = (Y_N'*diag(weights)*Y_N) \ (Y_N'*diag(weights) * F);
     end        
-
-
+
+    error = norm(Y_N*F_N-F)/norm(F);
+
 end
diff --git a/external/Spherical-Harmonic-Transform-master/leastSquaresSHTeven.m b/external/Spherical-Harmonic-Transform-master/leastSquaresSHTeven.m
@@ -1,4 +1,4 @@
-function [F_N, Y_N] = leastSquaresSHTeven(N, F, dirs, basisType, weights)
+function [F_N, Y_N, error] = leastSquaresSHTeven(N, F, dirs, basisType, weights)
 %LEASTSQUARESSHT Spherical harmonic transform of F using least-squares
 %
 %   N:  maximum order of transform
@@ -36,5 +36,5 @@
         F_N = (Y_N'*diag(weights)*Y_N) \ (Y_N'*diag(weights) * F);
     end        
 
-
+    error = norm(Y_N*F_N-F)/norm(F);
 end
diff --git a/external/Spherical-Harmonic-Transform-master/plotSphFunctionCoeffs.m b/external/Spherical-Harmonic-Transform-master/plotSphFunctionCoeffs.m
@@ -67,17 +67,18 @@
 end
 
 % plot 3d axes
-maxF = max(max(abs(Fgrid)));
-line([0 1.1*maxF],[0 0],[0 0],'color',[1 0 0])
-line([0 0],[0 1.1*maxF],[0 0],'color',[0 1 0])
-line([0 0],[0 0],[0 1.1*maxF],'color',[0 0 1])
+% maxF = max(max(abs(Fgrid)));
+% line([0 1.1*maxF],[0 0],[0 0],'color',[1 0 0])
+% line([0 0],[0 1.1*maxF],[0 0],'color',[0 1 0])
+% line([0 0],[0 0],[0 1.1*maxF],'color',[0 0 1])
 
 % plot function
 hold on
 if isequal(realComplex, 'real')
     Hp = surf(Dp_x, Dp_y, Dp_z);
     Hn = surf(Dn_x, Dn_y, Dn_z);
-    set(Hp, 'FaceColor', 'b')
+    %set(Hp, 'FaceColor', 'b')
+    set(Hp, 'FaceColor', [0.9976, 0.7778, 0.2042])
     set(Hp, 'EdgeAlpha', 0)
     set(Hn, 'FaceColor', 'r')
     set(Hn, 'EdgeAlpha', 0)

diff --git a/life/fe/feGet.m b/life/fe/feGet.m
@@ -1636,7 +1636,19 @@
             end
         end
 
-        val = val + repmat(mean(feGet(fe,'dsigmeasured'), 1),nTheta,1); %% add mean signal
+        dsigmeas = feGet(fe,'dsigmeasured');
+
+        if isfield(fe.life,'bvals_ind')
+            for n=1:length(fe.life.bvals_ind)
+                val(fe.life.bvals_ind{n},:) = val(fe.life.bvals_ind{n},:) + ...
+                    repmat(mean(dsigmeas(fe.life.bvals_ind{n},:), 1),...
+                    length(fe.life.bvals_ind{n}),1); %% add mean signal
+            end
+        else
+            val = val + repmat(mean(dsigmeas, 1),nTheta,1); %% add mean signal
+        end
+        %val = val(:);
+
 
     case 'keepdirections'
         ind = varargin{1};