Bug fixed: mrcImageSpatialFrequencyFilter

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter
index f606a3e..43791a4 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageSpatialFrequencyFilter differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index 117dec6..568d410 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a
index 2ad5b78..320d93d 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo
index 04b583d..9f9755f 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageSpatialFrequencyFilter.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a
index 2ad5b78..320d93d 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a
index 4bb8aee..6efe109 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ

diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo
index 04b583d..9f9755f 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageSpatialFrequencyFilter.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter
index f606a3e..43791a4 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/X86MAC64/mrcImageSpatialFrequencyFilter differ

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c b/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
index 20c24eb..c6bfd81 100644 (file)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageSpatialFrequencyFilter.c
@@ -24,6 +24,7 @@ lmrcImageSpatialFrequencyFilter(mrcImage* out, mrcImage* in, lmrcImageSpatialFre
        float XX, YY, ZZ, RR;
        double W, WL, WH;
        int R, RL, RH;
+       double DR;
        double rdata;
        double idata;
        int flag;
@@ -68,8 +69,9 @@ lmrcImageSpatialFrequencyFilter(mrcImage* out, mrcImage* in, lmrcImageSpatialFre
                        RH = MIN(R+1,linfo.nR-1);
                        if(linfo.R[R] <= RR) {
                                if(RR<linfo.R[RH]) {
-                                       W = (R-RL)*linfo.W[RH] + (RH-R)*linfo.W[R]; 
-                                       DEBUGPRINT2("R: %f  W: %f\n", RR, W);   
+                                       DR = (RR - linfo.R[R])/(linfo.R[RH] - linfo.R[R]);    
+                                       W = DR*linfo.W[RH] + (1.0-DR)*linfo.W[R]; 
+                                       DEBUGPRINT5("R: %f  W: %f DR: %f %f %f\n", RR, W, DR, linfo.W[R], linfo.W[RH]); 
                                        flag = 0;
                                } else {
                                        if(R==RH) {

diff --git a/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.c b/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.c
index 9c0b2b6..a0d4b1d 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.c
+++ b/src/Tools/mrcImage/mrcImageSpatialFrequencyFilter/src/mrcImageSpatialFrequencyFilter.c
@@ -15,7 +15,7 @@
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "mrcImage.h"