Bug fixed:

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

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageInfo b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageInfo
index a14c57a..b02efe5 100755 (executable)
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageInfo and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageInfo differ

diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a
index a479174..04d5bb1 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 c96fcb4..bdaa1f4 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/mrcImageInfo.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInfo.sharedo
index 3d152b4..4cbd9b5 100644 (file)
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInfo.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageInfo.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 c96fcb4..bdaa1f4 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 43ae92d..23eeace 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/mrcImageInfo.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInfo.sharedo
index 3d152b4..4cbd9b5 100644 (file)
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInfo.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageInfo.sharedo differ

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo
index a14c57a..b02efe5 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageInfo/src/X86MAC64/mrcImageInfo differ

diff --git a/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c b/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
index 2bfbff8..7001ba2 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
+++ b/src/Objects/DataManip/mrcImage/src/mrcImageInfo.c
@@ -217,7 +217,7 @@ lmrcImageYProjection(mrcImage* proj, mrcImage* img)
                }
 
        } else {
-               fprintf(stderr, "Not supported mode: %ld in lmrcImageYProjection\n", img->HeaderMode);
+               fprintf(stderr, "Not supported mode: %d in lmrcImageYProjection\n", img->HeaderMode);
                exit(EXIT_FAILURE);
        }
        mrcStatDataSet(proj, 0);
@@ -738,8 +738,7 @@ lmrcImageInformation(mrcImageInformation* info, mrcImage* img)
                        sumForCylinderSurface = 0;
                        sdForCylinderSurface  = 0;
        
-                       rmax = MIN(offsetx*img->HeaderLength.x,
-                                          offsety*img->HeaderLength.y);
+                       rmax = MIN(offsetx*img->HeaderLength.x, offsety*img->HeaderLength.y);
                        if (info->flagrmax){
                                if(info->rmax<rmax){
                                        fprintf(stderr,"rmax from option:%f\n",info->rmax);
@@ -791,16 +790,22 @@ lmrcImageInformation(mrcImageInformation* info, mrcImage* img)
                }
                case meanOfSphereSurface:{
                        DEBUGPRINT("meanOfSphereSurface\n");
-                       offsetx = floor ((img->HeaderN.x-1)/2); /* PIXEL */
-                       offsety = floor ((img->HeaderN.y-1)/2); /* PIXEL */ 
-                       offsetz = floor ((img->HeaderN.z-1)/2); /* PIXEL */
                        count = 0;      
                        sumForSphereSurface = 0;
 
-                       rmax = MIN3(offsetx*img->HeaderLength.x,
-                                               offsety*img->HeaderLength.y,
-                                               offsetz*img->HeaderLength.z);
-
+                       offsetx = floor ((img->HeaderN.x-1)/2); /* PIXEL */
+                       offsety = floor ((img->HeaderN.y-1)/2); /* PIXEL */ 
+                       
+                       if(1<img->HeaderN.z) {
+                               offsetz = floor ((img->HeaderN.z-1)/2); /* PIXEL */
+                               rmax = MIN3(offsetx*img->HeaderLength.x,
+                                                       offsety*img->HeaderLength.y,
+                                                       offsetz*img->HeaderLength.z);
+                       } else {
+                               offsetz = 0;
+                               rmax = MIN(offsetx*img->HeaderLength.x, 
+                                               offsety*img->HeaderLength.y);
+                       }
                        if (info->flagrmax){
                                if(info->rmax<rmax){
                                        fprintf(stderr,"rmax from option:%f\n",info->rmax);
@@ -880,7 +885,7 @@ lmrcImageInformation(mrcImageInformation* info, mrcImage* img)
                                info->sdOfEdge   = sqrt(sumForSd/count - SQR(info->meanOfEdge));
                                info->seOfEdge   = info->sdOfEdge/sqrt(count);
                        } else {
-                               fprintf(stderr, "pixel number %d for edge\n", count); 
+                               fprintf(stderr, "pixel number %f for edge\n", count); 
                                exit(EXIT_FAILURE);
                        }
                        break;
@@ -906,7 +911,7 @@ lmrcImageInformation(mrcImageInformation* info, mrcImage* img)
                                info->sdOfEdge   = sqrt(sumForSd/count - SQR(info->meanOfEdge));
                                info->seOfEdge   = info->sdOfEdge/sqrt(count);
                        } else {
-                               fprintf(stderr, "pixel number %d for edge\n", count); 
+                               fprintf(stderr, "pixel number %f for edge\n", count); 
                                exit(EXIT_FAILURE);
                        }
                        break;

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html
index 26fe0ab..db9a752 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html
+++ b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html
@@ -1 +1,41 @@
-/bin/bash: mrcImageInfo: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImageInfo</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageInfo</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageInfo
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input
+    [-o[utput]           Out                 (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output
+    [-X[Section]         X                   (0.0       ).as(Real                ) ] :Optional  :X Section at y=X(value)
+    [-Y[Section]         Y                   (0.0       ).as(Real                ) ] :Optional  :Y Section at y=Y(value)
+    [-x[Projection]                                                                ] :Optional  :x Projection[OutPut ASCII FILE]
+    [-y[Projection]                                                                ] :Optional  :y Projection[OutPut ASCII FILE]
+    [-H[istgram]         H                   (256       ).as(Integer             ) ] :Optional  :Histgram: Class Number: Normalize
+    [-H[istgram]2        H2                  (1         ).as(Real                ) ] :Optional  :Histgram2: Class Width: Integer: Normalize
+    [-H[istgram]3        H3                  (256       ).as(Integer             ) ] :Optional  :Histgram: Class Number: Count
+    [-H[istgram]4        H4                  (1         ).as(Real                ) ] :Optional  :Histgram2: Class Width: Integer: Count
+    [-H[istgram]5        H5                  (1         ).as(Integer             ) ] :Optional  :Histgram5: Class Number: Count
+    [-H[istgram]6        H6                  (1         ).as(Real                ) ] :Optional  :Histgram6: Class Width: Integer: Count
+    [-Low                Low                 (1         ).as(Real                ) ] :Optional  :Low : thres
+    [-High               High                (1         ).as(Real                ) ] :Optional  :High: thres
+    [-I[nfo]                                                                       ] :Optional  :Information
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-rmax               rmax                (250       ).as(Real                ) ] :Optional  :rmax [A]
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+The -I option uses -rmax or -m options
+-m 0: mean of all density
+   1: mean of sphere surface density at rmax
+   2: mean of cylinder surface density at rmax
+   3: mean of edge pixels 
+   4: mean of Centre
+   5: mean of Sparse 
+   6: mean of 2DEdge
+   7: RMS of all pixels 
+</PRE>
+</BODY>
+</HTML>