Please enter the commit message for your changes. Lines starting

 with '#' will be ignored, and an empty message aborts the commit.

 On branch master
 Your branch is up to date with 'origin/master'.

 Changes to be committed:
	modified:   hostdepend/ARM64MAC64
	modified:   src/Tools/Config/Define.inc
	modified:   src/Tools/mrcImage/mrcImageInfo/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImageInfo/inc/mrcImageInfo.h
	modified:   src/Tools/mrcImage/mrcImageInfo/src/:q
	modified:   src/Tools/mrcImage/mrcImageInfo/src/argCheck.c
	modified:   src/Tools/mrcImage/mrcImageInfo/src/init.c
	modified:   src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c
	modified:   src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html
	modified:   src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.pane
	modified:   src/Tools/mrcImage/mrcImageInfo/src/usage.c

 Changes not staged for commit:
	modified:   hostdepend/ARM64MAC64 (new commits)
	modified:   include/eosMATH.h

diff --git a/hostdepend/ARM64MAC64 b/hostdepend/ARM64MAC64
index 826adcc..e2bdb56 160000 (submodule)
--- a/hostdepend/ARM64MAC64
+++ b/hostdepend/ARM64MAC64
@@ -1 +1 @@
-Subproject commit 826adccdf5ee0aaa23ae4737f9f50c70d9b324f5
+Subproject commit e2bdb56acdb1d044e202ceb01a76166778a152ee

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 0605779..2f3bebc 100644 (file)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -39,3 +39,6 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/mrcImage/mrcImageInfo/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageInfo/Config/OptionControlFile
index 9a9e7f6..8ef78f9 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageInfo/Config/OptionControlFile
@@ -13,8 +13,9 @@
 "-H4","-H[istgram]4","Histgram2: Class Width: Integer: Count","Optional","1","1","H4","Real","1"
 "-H5","-H[istgram]5","Histgram5: Class Number: Count","Optional","1","1","H5","Integer","1"
 "-H6","-H[istgram]6","Histgram6: Class Width: Integer: Count","Optional","1","1","H6","Real","1"
-"-Low","-Low","Low : thres","Optional","1","1","Low","Real","1"
-"-High","-High","High: thres","Optional","1","1","High","Real","1"
+"-Low","-Low","Low","Optional","1","1","Low","Real","1"
+"-High","-High","High","Optional","1","1","High","Real","1"
+"-thres","-thres","threshold(rate)","Optional","1","1","Thres","Real","0.5"
 "-I","-I[nfo]","Information","Optional","0"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-rmax","-rmax","rmax [A]","Optional","1","1","rmax","Real","250"

diff --git a/src/Tools/mrcImage/mrcImageInfo/inc/mrcImageInfo.h b/src/Tools/mrcImage/mrcImageInfo/inc/mrcImageInfo.h
index 98b492a..889ab66 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/inc/mrcImageInfo.h
+++ b/src/Tools/mrcImage/mrcImageInfo/inc/mrcImageInfo.h
@@ -57,6 +57,9 @@ typedef struct mrcImageInfoInfo {
     long flagHigh;
     float High;
     
+    long flagThres;
+    float Thres;
+    
     long Info;
 
     long flagconfigFile;

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/:q b/src/Tools/mrcImage/mrcImageInfo/src/:q
old mode 100644 (file)
new mode 100755 (executable)

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/argCheck.c b/src/Tools/mrcImage/mrcImageInfo/src/argCheck.c
index cc90ea0..51a292c 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImageInfo/src/argCheck.c
@@ -187,6 +187,17 @@ argCheck(mrcImageInfoInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("thres") {
+                    if(i+1<argc) {
+                        info->Thres = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagThres++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("I") {
                     if(i+0<argc) {
                         info->Info++;

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/init.c b/src/Tools/mrcImage/mrcImageInfo/src/init.c
index 64d1637..4470c9f 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/src/init.c
+++ b/src/Tools/mrcImage/mrcImageInfo/src/init.c
@@ -27,6 +27,7 @@ init0(mrcImageInfoInfo* info)
     info->H6 = 1;    info->flagH6 = 0;
     info->Low = 1;    info->flagLow = 0;
     info->High = 1;    info->flagHigh = 0;
+    info->Thres = 0.5;    info->flagThres = 0;
     info->Info=0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->rmax = 250;    info->flagrmax = 0;
@@ -81,6 +82,9 @@ init1(mrcImageInfoInfo* info)
     if(info->flagHigh) {
     }
     
+    if(info->flagThres) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c
index ef587d0..93942e9 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c
+++ b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.c
@@ -37,7 +37,7 @@ main(int argc, char* argv[])
 #else
     mrcFileRead(&img, info.In, "from Main Routine", 0);
 #endif
-
+    
     lmrcImageInfo(&data, &img, &info);
     outputMrcImageInfo(info.fptOut, &data, &img, &info);
        exit(EXIT_SUCCESS);
@@ -57,6 +57,8 @@ additionalUsage()
        fprintf(stderr, "   6: mean of 2DEdge\n");
        fprintf(stderr, "   7: RMS of all pixels \n");
        fprintf(stderr, "   8: sd of all axes\n");
+       fprintf(stderr, "  %02d: mean of high value area\n", meanOfHighValueArea);
+       fprintf(stderr, "  %02d: mean of low value area\n",  meanOfLowValueArea);
 }
 
 void
@@ -96,6 +98,8 @@ lmrcImageInfo(infoDataList* data, mrcImage* img, mrcImageInfoInfo* info)
                data->info.rmax     = info->rmax;
                data->info.flagrmax = info->flagrmax;
                data->info.mode     = info->mode;
+        data->info.thresHigh = info->Thres;
+        data->info.thresLow  = info->Thres;
                lmrcImageInformation(&(data->info), img);
        }
 }
@@ -103,8 +107,7 @@ lmrcImageInfo(infoDataList* data, mrcImage* img, mrcImageInfoInfo* info)
 void
 outputMrcImageInfo(FILE* fpt, infoDataList* dat, mrcImage* img, mrcImageInfoInfo* info)
 {
-    int i, ix, iy, j;
-       double data;
+    int i, ix, iy, j;  double data;
        double dens;
                
     if(info->flagX) {
@@ -294,6 +297,18 @@ outputMrcImageInfo(FILE* fpt, infoDataList* dat, mrcImage* img, mrcImageInfoInfo
                        fprintf(fpt, "sdOfAllAxis: %15.6g %15.6g %15.6g\n", dat->info.sdOfAllAxis.x , dat->info.sdOfAllAxis.y, dat->info.sdOfAllAxis.z);
                                break;
                        }
+                       case meanOfHighValueArea:{ // 8
+                       fprintf(fpt, "meanOfHighValueArea(mean,sd,se):     %15.6g %15.6g %15.6g\n", dat->info.meanOfHighValueArea, dat->info.sdOfHighValueArea,     dat->info.seOfHighValueArea);
+                       fprintf(fpt, "meanOfHighValueArea(min,median,max): %15.6g %15.6g %15.6g\n", dat->info.minOfHighValueArea,  dat->info.medianOfHighValueArea, dat->info.maxOfHighValueArea);
+                       fprintf(fpt, "meanOfHighValueArea(thres,thresRate): %15.6g %15.6g \n", dat->info.thresOfHighValueArea,  dat->info.thresHigh);
+                               break;
+                       }
+                       case meanOfLowValueArea:{ // 8
+                       fprintf(fpt, "meanOfLowValueArea(mean,sd,se):     %15.6g %15.6g %15.6g\n", dat->info.meanOfLowValueArea, dat->info.sdOfLowValueArea,     dat->info.seOfLowValueArea);
+                       fprintf(fpt, "meanOfLowValueArea(min,median,max): %15.6g %15.6g %15.6g\n", dat->info.minOfLowValueArea,  dat->info.medianOfLowValueArea, dat->info.maxOfLowValueArea);
+                       fprintf(fpt, "meanOfLowValueArea(thres,thresRate): %15.6g %15.6g \n", dat->info.thresOfLowValueArea,  dat->info.thresLow);
+                               break;
+                       }
                        default:{
                                fprintf(stderr, "Not supported mode :%ld", info->mode);
                                exit(EXIT_FAILURE);

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html
index 576d35e..8913909 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html
+++ b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.html
@@ -21,8 +21,9 @@ Options:
     [-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
+    [-Low                Low                 (1         ).as(Real                ) ] :Optional  :Low
+    [-High               High                (1         ).as(Real                ) ] :Optional  :High
+    [-thres              Thres               (0.5       ).as(Real                ) ] :Optional  :threshold(rate)
     [-I[nfo]                                                                       ] :Optional  :Information
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-rmax               rmax                (250       ).as(Real                ) ] :Optional  :rmax [A]
@@ -38,6 +39,8 @@ The -I option uses -rmax or -m options
    6: mean of 2DEdge
    7: RMS of all pixels 
    8: sd of all axes
+  09: mean of high value area
+  10: mean of low value area
 </PRE>
 </BODY>
 </HTML>

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.pane b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.pane
index 2e1afce..538e9bc 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.pane
+++ b/src/Tools/mrcImage/mrcImageInfo/src/mrcImageInfo.pane
@@ -20,12 +20,13 @@
         -f 1 0 1 0 0 -1x1+1+16.500000 0 0 1.000000 0 0 0 'H4' 'Histgram2: Class Width: Integer: Count' H4
         -i 1 0 1 0 0 -1x1+1+18.000000 0 0 1 0 0 'H5' 'Histgram5: Class Number: Count' H5
         -f 1 0 1 0 0 -1x1+1+19.500000 0 0 1.000000 0 0 0 'H6' 'Histgram6: Class Width: Integer: Count' H6
-        -f 1 0 1 0 0 -1x1+1+21.000000 0 0 1.000000 0 0 0 'Low' 'Low : thres' Low
-        -f 1 0 1 0 0 -1x1+1+22.500000 0 0 1.000000 0 0 0 'High' 'High: thres' High
-        -t 1 0 1 0 0 6x1+1+24 'I' 'Information' I
-        -I 1 0 1 0 0 1 -1x1+1+25.500000 ' ' 'configFile' 'ConfigurationFile' c
-        -f 1 0 1 0 0 -1x1+1+27.000000 0 0 250.000000 0 0 0 'rmax' 'rmax [A]' rmax
-        -i 1 0 1 0 0 -1x1+1+28.500000 0 0 0 0 0 'mode' 'Mode' m
+        -f 1 0 1 0 0 -1x1+1+21.000000 0 0 1.000000 0 0 0 'Low' 'Low' Low
+        -f 1 0 1 0 0 -1x1+1+22.500000 0 0 1.000000 0 0 0 'High' 'High' High
+        -f 1 0 1 0 0 -1x1+1+24.000000 0 0 0.500000 0 0 0 'Thres' 'threshold(rate)' thres
+        -t 1 0 1 0 0 6x1+1+25 'I' 'Information' I
+        -I 1 0 1 0 0 1 -1x1+1+27.000000 ' ' 'configFile' 'ConfigurationFile' c
+        -f 1 0 1 0 0 -1x1+1+28.500000 0 0 250.000000 0 0 0 'rmax' 'rmax [A]' rmax
+        -i 1 0 1 0 0 -1x1+1+30.000000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/mrcImage/mrcImageInfo/src/usage.c b/src/Tools/mrcImage/mrcImageInfo/src/usage.c
index aa23605..dd41792 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageInfo/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageInfo/src/usage.c
@@ -20,8 +20,9 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-H[istgram]4        H4                  (1         ).as(Real                ) ] :Optional  :Histgram2: Class Width: Integer: Count\n");
     fprintf(stderr, "    [-H[istgram]5        H5                  (1         ).as(Integer             ) ] :Optional  :Histgram5: Class Number: Count\n");
     fprintf(stderr, "    [-H[istgram]6        H6                  (1         ).as(Real                ) ] :Optional  :Histgram6: Class Width: Integer: Count\n");
-    fprintf(stderr, "    [-Low                Low                 (1         ).as(Real                ) ] :Optional  :Low : thres\n");
-    fprintf(stderr, "    [-High               High                (1         ).as(Real                ) ] :Optional  :High: thres\n");
+    fprintf(stderr, "    [-Low                Low                 (1         ).as(Real                ) ] :Optional  :Low\n");
+    fprintf(stderr, "    [-High               High                (1         ).as(Real                ) ] :Optional  :High\n");
+    fprintf(stderr, "    [-thres              Thres               (0.5       ).as(Real                ) ] :Optional  :threshold(rate)\n");
     fprintf(stderr, "    [-I[nfo]                                                                       ] :Optional  :Information\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-rmax               rmax                (250       ).as(Real                ) ] :Optional  :rmax [A]\n");