Bug-fixed:

	lmrcImageCTFCompensation
	-flagWin : Sine window

	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageCTFCompensation.c

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageCTFCompensation b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageCTFCompensation
index a0b9260..aee8d5c 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageCTFCompensation and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageCTFCompensation differ

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageMultiCTFCompensation b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageMultiCTFCompensation
index de4967b..fb66be6 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageMultiCTFCompensation and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageMultiCTFCompensation differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index 34baf78..82e28c8 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 bda5be8..25e252c 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/lmrcImageCTFCompensation.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFCompensation.sharedo
index 3c52477..59a5ac0 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFCompensation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageCTFCompensation.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 bda5be8..25e252c 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 71aced3..a285c76 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/lmrcImageCTFCompensation.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFCompensation.sharedo
index 3c52477..59a5ac0 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFCompensation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageCTFCompensation.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageCTFCompensation/src/X86MAC64/mrcImageCTFCompensation b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageCTFCompensation/src/X86MAC64/mrcImageCTFCompensation
index a0b9260..aee8d5c 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageCTFCompensation/src/X86MAC64/mrcImageCTFCompensation and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageCTFCompensation/src/X86MAC64/mrcImageCTFCompensation differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/X86MAC64/mrcImageMultiCTFCompensation b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/X86MAC64/mrcImageMultiCTFCompensation
index de4967b..fb66be6 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/X86MAC64/mrcImageMultiCTFCompensation and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/X86MAC64/mrcImageMultiCTFCompensation differ

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageCTFCompensation.c b/src/Objects/DataManip/mrcImage/src/lmrcImageCTFCompensation.c
index 9acd4b0..3cb53b3 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageCTFCompensation.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageCTFCompensation.c
@@ -52,7 +52,7 @@ lmrcImageCTFCompensation(mrcImage* dstfft, ctfInfo* ctf, long mode)
                                        if(ctf->flagWin) {
                                                if(ctf->CutLow< R && R < ctf->CutHigh) {
                                                        Weight = Weight*(cos((R-ctf->CutLow)/(ctf->CutHigh-ctf->CutLow)*M_PI)+1)*0.5;
-                                               } else if(ctf->CutHigh < R) {
+                                               } else if(ctf->CutHigh <= R) {
                                                        Weight = 0.0;
                                                }
                                        }

diff --git a/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.c b/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.c
index c0d1afd..b2cf19f 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.c
+++ b/src/Tools/mrcImage/mrcImageMultiCTFCompensation/src/mrcImageMultiCTFCompensation.c
@@ -18,7 +18,7 @@ static char __sccs_id[] = "@(#)mrcImageMultiCTFCompensation ver1.3; Date:96/04/2
 #include <math.h>                  
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "String.h"
 #include "Memory.h"
@@ -97,7 +97,7 @@ main(int argc, char* argv[])
                } else {
                        ctf[i].flagWin = 0;
                }
-               DEBUGPRINT4("%f %f %f %d\n", ctf[i].defocus, ctf[i].Cs, ctf[i].kV, ctf[i].mode);
+               DEBUGPRINT4("%f %f %f %ld\n", ctf[i].defocus, ctf[i].Cs, ctf[i].kV, ctf[i].mode);
        }
        linfo.maxiteration  = info.MaxIter;
        linfo.okrms         = 1e-6;