Fix bug in mintV

Random image sizes where not accepted by min TV causing crashes Resolves #24
CERN · Nov 1, 2016 · bcb1f64 · bcb1f64
1 parent 79dcc95
commit bcb1f64
Show file tree

Hide file tree

Showing 5 changed files with 24 additions and 20 deletions.
diff --git a/Algorithms/ASD_POCS.m b/Algorithms/ASD_POCS.m
@@ -147,14 +147,14 @@
     %  TV MINIMIZATION
     % =========================================================================
     %  Call GPU to minimize TV
-%     f=minimizeTV(f0,dtvg,ng);    %   This is the MATLAB CODE, the functions are sill in the library, but CUDA is used nowadays
-                                            for ii=1:ng
-%                                                 Steepest descend of TV norm
-                                                tv(ng*(iter-1)+ii)=im3Dnorm(f,'TV','forward');
-                                                df=weighted_gradientTVnorm2(f,0.002);
-                                                df=df./im3Dnorm(df,'L2');
-                                                f=f-dtvg.*df;
-                                            end
+    f=minimizeTV(f0,dtvg,ng);    %   This is the MATLAB CODE, the functions are sill in the library, but CUDA is used nowadays
+%                                   for ii=1:ng
+% %                                 Steepest descend of TV norm
+%                                      tv(ng*(iter-1)+ii)=im3Dnorm(f,'TV','forward');
+%                                      df=weighted_gradientTVnorm2(f,0.002);
+%                                      df=df./im3Dnorm(df,'L2');
+%                                      f=f-dtvg.*df;
+%                                    end
 
     % update parameters
     % ==========================================================================

diff --git a/Source/minTV.cpp b/Source/minTV.cpp
@@ -102,14 +102,14 @@ void mexFunction(int  nlhs , mxArray *plhs[],
     float *  img = (float*)malloc(size_img[0] *size_img[1] *size_img[2]* sizeof(float));
     // We need a float image, and, unfortunatedly, the only way of casting it is by value
     // Also, MATLAB is column mayor and C is row mayor! we need to deal with that
-    for(int i=0;i<size_img[0];i++)
-        for(int j=0;j<size_img[1];j++)
-            for(int k=0;k<size_img[2];k++)
-        img[i*size_img[0]*size_img[1]+j*size_img[1]+k]=(float)imgaux[k*size_img[1]*size_img[2]+j*size_img[2]+i];
-
-
-
+//     for(int i=0;i<size_img[0];i++)
+//         for(int j=0;j<size_img[1];j++)
+//             for(int k=0;k<size_img[2];k++)
+//         img[i*size_img[0]*size_img[1]+j*size_img[1]+k]=(float)imgaux[k*size_img[1]*size_img[2]+j*size_img[2]+i];
 
+//     return;
+    for(int i=0;i<size_img[0]*size_img[1]*size_img[2];i++)
+        img[i]=(float)imgaux[i];
 
 
     // Allocte output image

diff --git a/Source/tvDenoise.cpp b/Source/tvDenoise.cpp
@@ -103,10 +103,13 @@ void mexFunction(int  nlhs , mxArray *plhs[],
     float *  img = (float*)malloc(size_img[0] *size_img[1] *size_img[2]* sizeof(float));
 //     for (int i=0;i<size_img[0] *size_img[1] *size_img[2];i++)
 //         img[i]=(float)imgaux[i];
-    for(int i=0;i<size_img[0];i++)
-        for(int j=0;j<size_img[1];j++)
-            for(int k=0;k<size_img[2];k++)
-               img[i*size_img[0]*size_img[1]+j*size_img[1]+k]=(float)imgaux[k*size_img[1]*size_img[2]+j*size_img[2]+i];
+//     for(int i=0;i<size_img[0];i++)
+//         for(int j=0;j<size_img[1];j++)
+//             for(int k=0;k<size_img[2];k++)
+//                img[i*size_img[0]*size_img[1]+j*size_img[1]+k]=(float)imgaux[k*size_img[1]*size_img[2]+j*size_img[2]+i];
+//     
+    for(int i=0;i<size_img[0]*size_img[1]*size_img[2];i++)
+        img[i]=(float)imgaux[i];
     //////////////
 
     // Allocte output image

diff --git a/Utilities/im3DDenoise.m b/Utilities/im3DDenoise.m
@@ -33,7 +33,7 @@
     immax=prctile(img(:),99);
     img=img./immax;
 
-    imgO=(permute(tvDenoise(permute(img,[3 2 1]),hyper,iter),[1 2 3]));
+    imgO=(permute(tvDenoise(permute(img,[3 2 1]),hyper,iter),[3 2 1]));
     clear img;
 
     imgO=imgO*immax;

diff --git a/Utilities/minimizeTV.m b/Utilities/minimizeTV.m
@@ -30,6 +30,7 @@
         error('Wrogn amount of inputs');
     end
 end
+img=(permute(img,[3 2 1]));
 img=minTV(img,dtvg,ng);
     img=(permute(img,[3 2 1]));
 end