Bug fixed:

	modified:   src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
	modified:   src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c

diff --git a/Makefile b/Makefile
index 17b0766..5263654 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -92,22 +92,22 @@ relink:
 git-add-all:: git-add git-add-data git-add-optional git-add-tutorial git-add-others
 
 git-add::
-       git add -v .
+       git add -v --all .
 
 git-add-optional::
-       cd optional; git add -v . 
+       cd optional; git add -v --all . 
 
 git-add-data::
-       cd data; git add -v . 
+       cd data; git add -v --all . 
 
 git-add-tutorial::
-       cd tutorial; git add -v . 
+       cd tutorial; git add -v --all . 
 
 git-add-others::
-       cd others; git add -v . 
+       cd others; git add -v --all . 
 
 git-add-others2::
-       cd others2; git add . 
+       cd others2; git add --all . 
 
 git-commit-all:: git-commit git-commit-data git-commit-optional git-commit-tutorial git-commit-others
 

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageFourierNeighborCorrelation b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageFourierNeighborCorrelation
index 672da83..4db938c 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageFourierNeighborCorrelation and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageFourierNeighborCorrelation differ

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcInfo b/hostdepend/X86MAC64/bin/X86MAC64/mrcInfo
index c81fbdd..1681ca2 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcInfo and b/hostdepend/X86MAC64/bin/X86MAC64/mrcInfo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index fb4a775..db9770c 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 ca24a93..4fe2859 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/mrcImagePrint.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagePrint.sharedo
index 50b15d1..f3e7f2e 100755 (executable)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagePrint.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImagePrint.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 ca24a93..4fe2859 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 65588fa..0904a4e 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/mrcImagePrint.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagePrint.sharedo
index 50b15d1..f3e7f2e 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagePrint.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImagePrint.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/X86MAC64/mrcImageFourierNeighborCorrelation b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/X86MAC64/mrcImageFourierNeighborCorrelation
index 672da83..4db938c 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/X86MAC64/mrcImageFourierNeighborCorrelation and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/X86MAC64/mrcImageFourierNeighborCorrelation differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcInfo/src/X86MAC64/mrcInfo b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcInfo/src/X86MAC64/mrcInfo
index c81fbdd..1681ca2 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcInfo/src/X86MAC64/mrcInfo and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcInfo/src/X86MAC64/mrcInfo differ

diff --git a/src/Objects/DataManip/mrcImage/src/mrcImagePrint.c b/src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
index 96b546f..ef0e1a5 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
+++ b/src/Objects/DataManip/mrcImage/src/mrcImagePrint.c
@@ -98,7 +98,7 @@ mrcInfoPrint(FILE* fpt, mrcImage* mrc, mrcImageParaTypeInteger mode)
                break;
        }
        fprintf(fpt, "Mode         :  %10ld  %s         \n", mrc->HeaderMode, ModeName);
-    fprintf(fpt, "StartN       : (%10lu, %10lu, %10lu)\n", mrc->HeaderStartN.x, mrc->HeaderStartN.y, mrc->HeaderStartN.z);
+    fprintf(fpt, "StartN       : (%10ld, %10ld, %10ld)\n", mrc->HeaderStartN.x, mrc->HeaderStartN.y, mrc->HeaderStartN.z);
     fprintf(fpt, "M            : (%10ld, %10ld, %10ld)\n", mrc->HeaderM.x, mrc->HeaderM.y, mrc->HeaderM.z);
     fprintf(fpt, "Length       : (%10.3f, %10.3f, %10.3f)\n", mrc->HeaderLength.x, mrc->HeaderLength.y, mrc->HeaderLength.z);
     fprintf(fpt, "A,B,G        : (%10.2f, %10.2f, %10.2f)\n", mrc->HeaderAlpha, mrc->HeaderBeta, mrc->HeaderGamma);

diff --git a/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c b/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c
index a8ac387..2fdb580 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c
+++ b/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.c
@@ -82,4 +82,5 @@ void
 additionalUsage()
 {
        fprintf(stderr, "----- Additional Usage -----\n");
+       lmrcImageFourierNeighborCorrelationPrintCentreMode(stderr);
 }

diff --git a/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.html b/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.html
index 614e811..31be4a4 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.html
+++ b/src/Tools/mrcImage/mrcImageFourierNeighborCorrelation/src/mrcImageFourierNeighborCorrelation.html
@@ -19,6 +19,10 @@ Options:
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----
+0: Centre is ImageCentre Shift: (Nx/2.0, Ny/2.0, Nz/2.0 ) 
+1: Centre is BottomLeft  Shift: (0,      0,      0      ) 
+2: Use StartN            Shift: (StartNx,StartNy,StartNz) 
+Duncan Sousa, Nikolaus Grigorieff, 2007, JSB 
 </PRE>
 </BODY>
 </HTML>