Updates on filter orientations.

fordanic · Mar 5, 2015 · 221b492 · 221b492
1 parent 5b48330
commit 221b492
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/create_monomial_filters_for_structure_tensor_computation2d.m b/create_monomial_filters_for_structure_tensor_computation2d.m
@@ -145,13 +145,13 @@ function create_monomial_filters_for_structure_tensor_computation2d()
     Fi0 = bplognorm(frequencySize, u0, B, spacing);
 
     % Order 1
-    Fi1{1} = Fi0.*Yh;
-    Fi1{2} = Fi0.*Xh;
+    Fi1{1} = Fi0.*Xh;
+    Fi1{2} = Fi0.*Yh;
 
     % Order 2
-    Fi2{1}  = Fi0.*Yh.*Yh;
-    Fi2{2}  = Fi0.*Yh.*Xh;
-    Fi2{3}  = Fi0.*Xh.*Xh;
+    Fi2{1}  = Fi0.*Xh.*Xh;
+    Fi2{2}  = Fi0.*Xh.*Yh;
+    Fi2{3}  = Fi0.*Yh.*Yh;
 
     % Order 0
     fprintf('Order 0------------------------------ \n')
@@ -177,7 +177,7 @@ function create_monomial_filters_for_structure_tensor_computation2d()
     end
     fprintf('\n\n')
 
-    f0 = getdata(f0);
+    f0 = real(getdata(f0));
     for k = 1: length(Fi1)
         f1{k} = imag(getdata(f1{k}));
     end

diff --git a/create_monomial_filters_for_structure_tensor_computation3d.m b/create_monomial_filters_for_structure_tensor_computation3d.m
@@ -137,7 +137,7 @@ function create_monomial_filters_for_structure_tensor_computation3d()
     Ys = Ys/spacing(2);
     Zs = Zs/spacing(3);
 
-    Rs = sqrt(Ys.*Ys + Xs.*Xs + Zs.*Zs) + eps;
+    Rs = sqrt(Xs.*Xs + Ys.*Ys + Zs.*Zs) + eps;
 
     Xh = Xs./Rs;   % h for hat
     Yh = Ys./Rs;
@@ -147,16 +147,16 @@ function create_monomial_filters_for_structure_tensor_computation3d()
     Fi0 = bplognorm(frequencySize, u0, B, spacing);
 
     % Order 1
-    Fi1{1} = Fi0.*Yh;
-    Fi1{2} = Fi0.*Xh;
+    Fi1{1} = Fi0.*Xh;
+    Fi1{2} = Fi0.*Yh;
     Fi1{3} = Fi0.*Zh;
 
     % Order 2
-    Fi2{1}  = Fi0.*Yh.*Yh;
-    Fi2{2}  = Fi0.*Yh.*Xh;
-    Fi2{3}  = Fi0.*Yh.*Zh;
-    Fi2{4}  = Fi0.*Xh.*Xh;
-    Fi2{5}  = Fi0.*Xh.*Zh;
+    Fi2{1}  = Fi0.*Xh.*Xh;
+    Fi2{2}  = Fi0.*Xh.*Yh;
+    Fi2{3}  = Fi0.*Xh.*Zh;
+    Fi2{4}  = Fi0.*Yh.*Yh;
+    Fi2{5}  = Fi0.*Yh.*Zh;
     Fi2{6}  = Fi0.*Zh.*Zh;
 
     % Order 0
@@ -183,7 +183,7 @@ function create_monomial_filters_for_structure_tensor_computation3d()
     end
     fprintf('\n\n')
 
-    f0 = getdata(f0);
+    f0 = real(getdata(f0));
     for k = 1: length(Fi1)
         f1{k} = imag(getdata(f1{k}));
     end

diff --git a/monomialsForStructureTensor2D.mat b/monomialsForStructureTensor2D.mat
diff --git a/monomialsForStructureTensor3D.mat b/monomialsForStructureTensor3D.mat