ticket: #34999

	mrcImageAreaCalc
	-H and -OH for Histgram

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 46b7165..07ded41 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -576,3 +576,7 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageAreaCalc/Config/OptionControlFile
index b3918e5..8f57f1b 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/Config/OptionControlFile
@@ -1,8 +1,10 @@
 # OptionControlFile
 # FileFormat
-"-i","-i[nput]","Input: mrcImage","Essential","1","1","In","inFile","NULL"
-"-o","-o[utput]","Output: mrcImage:area","Essential","1","1","Out","outFile","NULL"
-"-O","-O[utput]","Output: ASCII: area info","Optional","1","1","OutInfo","outFile","stdout"
-"-l","-l[abel]","Output: mrcImage:labeling","Optional","1","1","Label","outFile","NULL"
+"-i","-i[nput]","Input: mrcImage","Essential","1","1","In","inFile::mrcImage","NULL"
+"-o","-o[utput]","Output: mrcImage:area","Essential","1","1","Out","outFile::mrcImage","NULL"
+"-O","-O[utput]","Output: ASCII: area info","Optional","1","1","OutInfo","outFile::ASCII","stdout"
+"-l","-l[abel]","Output: mrcImage:labeling","Optional","1","1","Label","outFile::mrcImage","NULL"
+"-OH","-O[utput]H[istgram]","Output: ASCII: area info","Optional","1","1","OutHist","outFile::ASCII","NULL"
+"-H","-H[istgram]","Delta","Optional","1","1","DelHist","Real","1"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/inc/mrcImageAreaCalc.h b/src/Tools/mrcImage/mrcImageAreaCalc/inc/mrcImageAreaCalc.h
index 75cba46..1e23471 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/inc/mrcImageAreaCalc.h
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/inc/mrcImageAreaCalc.h
@@ -29,6 +29,13 @@ typedef struct mrcImageAreaCalcInfo {
     char* Label;
     FILE* fptLabel;
     
+    long flagOutHist;
+    char* OutHist;
+    FILE* fptOutHist;
+    
+    long flagDelHist;
+    float DelHist;
+    
     long flagconfigFile;
     char* configFile;
     FILE* fptconfigFile;

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/argCheck.c b/src/Tools/mrcImage/mrcImageAreaCalc/src/argCheck.c
index 2c00283..c798367 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/src/argCheck.c
@@ -72,6 +72,28 @@ argCheck(mrcImageAreaCalcInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("OH") {
+                    if(i+1<argc) {
+                        info->OutHist = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagOutHist++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("H") {
+                    if(i+1<argc) {
+                        info->DelHist = stringGetNthRealData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagDelHist++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("c") {
                     if(i+1<argc) {
                         info->configFile = stringGetNthWord(argv[i+1], 1, " ,");

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/init.c b/src/Tools/mrcImage/mrcImageAreaCalc/src/init.c
index 8836fd5..6bee2c3 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/src/init.c
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/src/init.c
@@ -16,6 +16,8 @@ init0(mrcImageAreaCalcInfo* info)
     info->fptOut = NULL;    info->flagOut = 0;
     info->fptOutInfo = stdout;    info->flagOutInfo = 0;
     info->fptLabel = NULL;    info->flagLabel = 0;
+    info->fptOutHist = NULL;    info->flagOutHist = 0;
+    info->DelHist = 1;    info->flagDelHist = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->mode = 0;    info->flagmode = 0;
 }
@@ -51,6 +53,13 @@ init1(mrcImageAreaCalcInfo* info)
         info->fptLabel = fileOpen(info->Label, "w");
     }
     
+    if(info->flagOutHist) {
+        info->fptOutHist = fileOpen(info->OutHist, "w");
+    }
+    
+    if(info->flagDelHist) {
+    }
+    
     if(info->flagconfigFile) {
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.c b/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.c
index ab7f9d1..46606d5 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.c
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.c
@@ -40,6 +40,9 @@ main(int argc, char* argv[])
        mrcImage in;
        mrcImage label;
        mrcImage out;
+       int n, i;
+       double dens;
+       double* datHist;
 
        init0(&info);
     argCheck(&info, argc, argv);
@@ -55,6 +58,16 @@ main(int argc, char* argv[])
                mrcFileWrite(&label, info.Label, "mrcFileWrite", 0);
        }
        fprintf(info.fptOutInfo, "MaxRegion: %f \n", out.HeaderAMax);
+
+       if(info.flagOutHist) {
+               lmrcImageHistgram4(&datHist, info.DelHist, &out);
+               n = (unsigned long)((out.HeaderAMax - out.HeaderAMin)/info.DelHist + 1);
+               for(i=0; i<n; i++) {
+                       dens = out.HeaderAMin + i*info.DelHist;
+                       fprintf(info.fptOutHist, "%15.6g %15.6g \n", dens, datHist[i]);
+               }
+       }
+
        exit(EXIT_SUCCESS);
 }
 

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.html b/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.html
index 7956f8f..7395391 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.html
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.html
@@ -8,10 +8,12 @@
 <PRE>
 Usage: mrcImageAreaCalc
 Options:
-    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: mrcImage
-    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: mrcImage:area
-    [-O[utput]           OutInfo             (stdout    ).as(outFile             ) ] :Optional  :Output: ASCII: area info
-    [-l[abel]            Label               (NULL      ).as(outFile             ) ] :Optional  :Output: mrcImage:labeling
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: mrcImage
+    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output: mrcImage:area
+    [-O[utput]           OutInfo             (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output: ASCII: area info
+    [-l[abel]            Label               (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output: mrcImage:labeling
+    [-O[utput]H[istgram] OutHist             (NULL      ).as(outFile::ASCII      ) ] :Optional  :Output: ASCII: area info
+    [-H[istgram]         DelHist             (1         ).as(Real                ) ] :Optional  :Delta
     [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
     [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
 ----- Additional Usage -----

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.pane b/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.pane
index 2042c5b..d1b41e0 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.pane
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/src/mrcImageAreaCalc.pane
@@ -11,8 +11,10 @@
         -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'Output: mrcImage:area' o
         -O 1 0 1 0 0 1 -1x1+1+4.500000 ' ' 'OutInfo' 'Output: ASCII: area info' O
         -O 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'Label' 'Output: mrcImage:labeling' l
-        -I 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'mode' 'Mode' m
+        -O 1 0 1 0 0 1 -1x1+1+7.500000 ' ' 'OutHist' 'Output: ASCII: area info' OH
+        -f 1 0 1 0 0 -1x1+1+9.000000 0 0 1.000000 0 0 0 'DelHist' 'Delta' H
+        -I 1 0 1 0 0 1 -1x1+1+10.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/test/Makefile b/src/Tools/mrcImage/mrcImageAreaCalc/src/test/Makefile
old mode 100644 (file)
new mode 100755 (executable)
index f43d620..41eb845
--- a/src/Tools/mrcImage/mrcImageAreaCalc/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/src/test/Makefile
@@ -14,6 +14,11 @@ exec:
        ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.area -l data/test.label 
        @echo "----- Calc check -----"          
 
+exec1:
+       @echo "----- Execution Check -----"
+       ../$(OSTYPE)/$(OBJECTNAME) -i data/test1.bin -o data/test1.area -l data/test1.label -OH data/test1.hist
+       @echo "----- Calc check -----"          
+
 exec2:
        @echo "----- Execution Check -----"
        ../$(OSTYPE)/$(OBJECTNAME) -i data/test2.bin -o data/test2.area -l data/test2.label 
@@ -29,6 +34,7 @@ clean:
 init:
        pdb2mrc -i data/121p.pdb2 -o data/test.mrc -nx 32 -ny 32 -nz 32 -dx 2 -dy 2 -dz 2 -Sx -32 -Sy -32 -Sz -32 -sig 1.6 -w 1.0
        mrcImageBinalization -i data/test.mrc -o data/test.bin -m 32
+       mrcImageErosin       -i data/test.bin -o data/test1.bin 
        mrcImageBinalization -i data/test2.mrc -o data/test2.bin -m 33
        mrcImageErosion      -i data/test2.bin -o data/test3.bin 
 

diff --git a/src/Tools/mrcImage/mrcImageAreaCalc/src/usage.c b/src/Tools/mrcImage/mrcImageAreaCalc/src/usage.c
index 597cb0e..16e67ed 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageAreaCalc/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageAreaCalc/src/usage.c
@@ -7,10 +7,12 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFile              ) ] :Essential :Input: mrcImage\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :Output: mrcImage:area\n");
-    fprintf(stderr, "    [-O[utput]           OutInfo             (stdout    ).as(outFile             ) ] :Optional  :Output: ASCII: area info\n");
-    fprintf(stderr, "    [-l[abel]            Label               (NULL      ).as(outFile             ) ] :Optional  :Output: mrcImage:labeling\n");
+    fprintf(stderr, "    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: mrcImage\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output: mrcImage:area\n");
+    fprintf(stderr, "    [-O[utput]           OutInfo             (stdout    ).as(outFile::ASCII      ) ] :Optional  :Output: ASCII: area info\n");
+    fprintf(stderr, "    [-l[abel]            Label               (NULL      ).as(outFile::mrcImage   ) ] :Optional  :Output: mrcImage:labeling\n");
+    fprintf(stderr, "    [-O[utput]H[istgram] OutHist             (NULL      ).as(outFile::ASCII      ) ] :Optional  :Output: ASCII: area info\n");
+    fprintf(stderr, "    [-H[istgram]         DelHist             (1         ).as(Real                ) ] :Optional  :Delta\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();