mrcImageLocalMaximumValuesFind

	new file:   include/lmrcImageLocal.h
	new file:   src/Objects/DataManip/mrcImage/src/lmrcImageLocal.h
	copied:     src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/mrcImageLocalMaximumValuesFind.c -> src/Objects/DataManip/mrcImage/src/lmrcImageLocalMaximumValuesFind.c
	modified:   src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/mrcImageLocalMaximumValuesFind.c

diff --git a/.gitignore b/.gitignore
index 57be657..8aa6dff 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -48,6 +48,7 @@ others/
 others2/
 tutorial/
 zephyr/
+pione/
 
 #
 */*/*/*/*/*/*/tclIndex

diff --git a/Makefile b/Makefile
index 749cd86..2eefada 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -9,12 +9,17 @@ EOS_GIT_REPOSITRY_DATA= git.sourceforge.jp:/gitroot/eos/data.git
 EOS_GIT_REPOSITRY_DATA_NOUSER=git://git.sourceforge.jp/gitroot/eos/data.git
 EOS_GIT_REPOSITRY_OTHERS= git.sourceforge.jp:/gitroot/eos/others.git 
 EOS_GIT_REPOSITRY_OTHERS_NOUSER=git://git.sourceforge.jp/gitroot/eos/others.git
-EOS_GIT_REPOSITRY_ZEPHYR= git.sourceforge.jp:/gitroot/eos/zephyr.git 
-EOS_GIT_REPOSITRY_ZEPHYR_NOUSER=git://git.sourceforge.jp/gitroot/eos/zephyr.git
+
 
 EOS_GIT_REPOSITRY_HOSTDEPEND=git.sourceforge.jp:/gitroot/eos/hostdepend
 EOS_GIT_REPOSITRY_HOSTDEPEND_NOUSER=git://git.sourceforge.jp/gitroot/eos/hostdepend
 
+EOS_GIT_REPOSITRY_ZEPHYR= git.sourceforge.jp:/gitroot/eos/zephyr.git 
+EOS_GIT_REPOSITRY_ZEPHYR_NOUSER=git://git.sourceforge.jp/gitroot/eos/zephyr.git
+
+EOS_GIT_REPOSITRY_PIONE=https://github.com/pione/pione.git
+EOS_GIT_REPOSITRY_PIONE_NOUSER=https://github.com/pione/pione.git
+
 help::
        @echo ">> Help"
        @echo ">>>> Download"
@@ -35,6 +40,7 @@ help::
        @echo "---- option ----"
        @echo "     [] : base only"
        @echo "     [-zephyr]   : zephyr (for GUI/browser)"
+       @echo "     [-pione]    : pione  (for process control with GUI/browser)"
        @echo "     [-data]     : data (for test)"
        @echo "     [-tutorial] : tutorial"
        @echo "     [-optional] : optional(for documents)"
@@ -344,6 +350,13 @@ git-init-zephyr::
        @export ORIGINNAME=zephyr; \
        make git-remote-add-zephyr;
 
+git-init-pione::
+       if [ ! -d pione ] ; then mkdir pione; fi
+       cd pione; \
+       if [ ! -d .git ] ; then git init        ; fi ;
+       @export ORIGINNAME=pione; \
+       make git-remote-add-pione;
+
 git-init-optional::
        if [ ! -d optional ] ; then mkdir optional; fi
        if [ ! -L doc      ] ; then ln -sf optional/doc . ; fi

diff --git a/include/lmrcImageLocal.h b/include/lmrcImageLocal.h
new file mode 100644 (file)
index 0000000..61d3f03
--- /dev/null
+++ b/include/lmrcImageLocal.h
@@ -0,0 +1,58 @@
+/*
+# lmrcImageLocal.h : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : lmrcImageLocal.h 
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+/* $Log$ */
+#ifndef LMRCIMAGELOCAL_H
+#define LMRCIMAGELOCAL_H
+
+#include <stdio.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>    
+#define DEBUG
+#include "genUtil.h"
+#include "mrcImage.h"
+
+/* constant begin */
+
+
+/* constant end */
+
+/* struct begin */
+
+typedef struct lmrcImageLocalMaximumValuesFindInfo {
+    double threshold; 
+       int size;
+} lmrcImageLocalMaximumValuesFindInfo;
+
+typedef enum lmrcImageLocalMaximumValuesFindMode {
+       a=0,
+       b=1 
+} lmrcImageLocalMaximumValuesFindMode;
+
+
+/* struct end */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* prototype begin */
+
+extern void lmrcImageLocalMaximumValuesFind(mrcImage* out, mrcImage* in, lmrcImageLocalMaximumValuesFindInfo* linfo, int mode); 
+
+/* prototype end */
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif  /* XXXX */ 

diff --git a/src/Objects/DataManip/mrcImage/src/.CHeader b/src/Objects/DataManip/mrcImage/src/.CHeader
index ddb212e..dfd5459 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/.CHeader
+++ b/src/Objects/DataManip/mrcImage/src/.CHeader
@@ -43,6 +43,7 @@ lmrcImageFourierNeighborCorrelation.h \
 lmrcImageFourierShellCorrelation.h \
 lmrcImageHoughTransform.h \
 lmrcImageLabeling.h \
+lmrcImageLocal.h \
 lmrcImageLogic.h \
 lmrcImageMasking.h \
 lmrcImageMirroring.h \

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageLocal.h b/src/Objects/DataManip/mrcImage/src/lmrcImageLocal.h
new file mode 100644 (file)
index 0000000..61d3f03
--- /dev/null
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageLocal.h
@@ -0,0 +1,58 @@
+/*
+# lmrcImageLocal.h : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : lmrcImageLocal.h 
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+/* $Log$ */
+#ifndef LMRCIMAGELOCAL_H
+#define LMRCIMAGELOCAL_H
+
+#include <stdio.h>
+
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>    
+#define DEBUG
+#include "genUtil.h"
+#include "mrcImage.h"
+
+/* constant begin */
+
+
+/* constant end */
+
+/* struct begin */
+
+typedef struct lmrcImageLocalMaximumValuesFindInfo {
+    double threshold; 
+       int size;
+} lmrcImageLocalMaximumValuesFindInfo;
+
+typedef enum lmrcImageLocalMaximumValuesFindMode {
+       a=0,
+       b=1 
+} lmrcImageLocalMaximumValuesFindMode;
+
+
+/* struct end */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/* prototype begin */
+
+extern void lmrcImageLocalMaximumValuesFind(mrcImage* out, mrcImage* in, lmrcImageLocalMaximumValuesFindInfo* linfo, int mode); 
+
+/* prototype end */
+
+#ifdef __cplusplus
+};
+#endif
+
+#endif  /* XXXX */ 

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageLocalMaximumValuesFind.c b/src/Objects/DataManip/mrcImage/src/lmrcImageLocalMaximumValuesFind.c
new file mode 100755 (executable)
index 0000000..2c0207d
--- /dev/null
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageLocalMaximumValuesFind.c
@@ -0,0 +1,65 @@
+/*
+# mrcImageLocalMaximumValuesFind : $Revision$  
+# $Date$ 
+# Created by $Author$
+# Usage : mrcImageLocalMaximumValuesFind
+# Attention
+#   $Loccker$
+#      $State$ 
+#
+*/
+
+#define DEBUG
+#include "genUtil.h"
+#include "./lmrcImageLocal.h"
+
+void 
+lmrcImageLocalMaximumValuesFind(mrcImage* out, mrcImage* in, lmrcImageLocalMaximumValuesFindInfo* linfo, int mode) 
+{
+       int x, y, z;
+       int X, Y, Z;
+       double data, d, dst, rr;
+       int flag;
+
+       out->Header = in->Header;
+       mrcInit(out, NULL);
+
+       for(z=0; z<in->HeaderN.z; z++) {
+       for(y=0; y<in->HeaderN.y; y++) {
+       for(x=0; x<in->HeaderN.x; x++) {
+               mrcPixelDataSet(out, x, y, z, 1, mrcPixelRePart);       
+       }
+       }
+       }
+
+       for(z=0; z<in->HeaderN.z; z++) {
+       for(y=0; y<in->HeaderN.y; y++) {
+       for(x=0; x<in->HeaderN.x; x++) {
+               mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);        
+               if(linfo->threshold<data) {
+                       flag = 1;
+                       for(X=x-linfo->size/2; X<=x+linfo->size/2 && flag==1; X++) {            
+                       for(Y=y-linfo->size/2; Y<=y+linfo->size/2 && flag==1; Y++) {            
+                       for(Z=z-linfo->size/2; Z<=z+linfo->size/2 && flag==1; Z++) {            
+                               rr = SQR(X-x)+SQR(Y-y)+SQR(Z-z);
+                               if(0 < rr && rr <= SQR(linfo->size)) {
+                                       mrcPixelDataGet(in, X, Y, Z, &d, mrcPixelRePart, mrcPixelHowNearest);
+                                       if(data<d) {
+                                               flag = 0;
+                                       }
+                               }
+                       }
+                       }
+                       }
+                       if(flag==1) {
+                               mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart);
+                       } else {
+                               mrcPixelDataSet(out, x, y, z, 0, mrcPixelRePart);
+                       }
+               } else {
+                       mrcPixelDataSet(out, x, y, z, 0, mrcPixelRePart);
+               }
+       }
+       }
+       }
+}

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageLocalMaximumValuesFind.h.org b/src/Objects/DataManip/mrcImage/src/lmrcImageLocalMaximumValuesFind.h.org
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/mrcImageLocalMaximumValuesFind.c b/src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/mrcImageLocalMaximumValuesFind.c
index 9357a01..aedc164 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/mrcImageLocalMaximumValuesFind.c
+++ b/src/Tools/mrcImage/mrcImageLocalMaximumValuesFind/src/mrcImageLocalMaximumValuesFind.c
@@ -18,18 +18,7 @@
 #define DEBUG
 #include "genUtil.h"
 #include "mrcImage.h"
-
-typedef struct lmrcImageLocalMaximumValuesFindInfo {
-       double threshold; 
-       int size;
-} lmrcImageLocalMaximumValuesFindInfo;
-
-typedef enum lmrcImageLocalMaximumValuesFindMode {
-       a=0,
-       b=1
-} lmrcImageLocalMaximumValuesFindMode;
-
-extern void lmrcImageLocalMaximumValuesFind(mrcImage* out, mrcImage* in, lmrcImageLocalMaximumValuesFindInfo* linfo, int mode); 
+#include "lmrcImageLocal.h"
 
 int
 main(int argc, char* argv[]) 
@@ -63,54 +52,3 @@ additionalUsage()
        fprintf(stderr, "----- Additional Usage -----\n");
 }
 
-
-void 
-lmrcImageLocalMaximumValuesFind(mrcImage* out, mrcImage* in, lmrcImageLocalMaximumValuesFindInfo* linfo, int mode) 
-{
-       int x, y, z;
-       int X, Y, Z;
-       double data, d, dst, rr;
-       int flag;
-
-       out->Header = in->Header;
-       mrcInit(out, NULL);
-
-       for(x=0; x<in->HeaderN.x; x++) {
-       for(y=0; y<in->HeaderN.y; y++) {
-       for(z=0; z<in->HeaderN.z; z++) {
-               mrcPixelDataSet(out, x, y, z, 1, mrcPixelRePart);       
-       }
-       }
-       }
-
-       for(x=0; x<in->HeaderN.x; x++) {
-       for(y=0; y<in->HeaderN.y; y++) {
-       for(z=0; z<in->HeaderN.z; z++) {
-               mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);        
-               if(linfo->threshold<data) {
-                       flag = 1;
-                       for(X=x-linfo->size/2; X<=x+linfo->size/2 && flag==1; X++) {            
-                       for(Y=y-linfo->size/2; Y<=y+linfo->size/2 && flag==1; Y++) {            
-                       for(Z=z-linfo->size/2; Z<=z+linfo->size/2 && flag==1; Z++) {            
-                               rr = SQR(X-x)+SQR(Y-y)+SQR(Z-z);
-                               if(0 < rr && rr <= SQR(linfo->size)) {
-                                       mrcPixelDataGet(in, X, Y, Z, &d, mrcPixelRePart, mrcPixelHowNearest);
-                                       if(data<d) {
-                                               flag = 0;
-                                       }
-                               }
-                       }
-                       }
-                       }
-                       if(flag==1) {
-                               mrcPixelDataSet(out, x, y, z, data, mrcPixelRePart);
-                       } else {
-                               mrcPixelDataSet(out, x, y, z, 0, mrcPixelRePart);
-                       }
-               } else {
-                       mrcPixelDataSet(out, x, y, z, 0, mrcPixelRePart);
-               }
-       }
-       }
-       }
-}

diff --git a/util/Makefile b/util/Makefile
index e35ca53..b2de369 100644 (file)
--- a/util/Makefile
+++ b/util/Makefile
@@ -4,7 +4,16 @@ include Config/Define.inc
 help:
        @echo ">>>> How to set a new util for a new architecture"
        @echo "$$ make setting"
+       @echo ">>> Rebuild"
        @echo "$$ make rebuild"
+       @echo "$$  or "
+       @echo "$$ make check"
+       @echo "$$ make clean"
+       @echo "$$ make config"
+       @echo "$$ make all"
+       @echo ">>> Cleaning directories"
+       @echo "$$ make clean"
+       @echo "$$ make cleanAll"
 
 rebuild:
        make check
@@ -24,6 +33,15 @@ all:
        cd src$(OSTYPE) ; \
        make all 
 
+clean: 
+       cd src$(OSTYPE) ; \
+       make clean 
+
+cleanAll: 
+       cd src$(OSTYPE) ; \
+       make cleanAll 
+
+
 setting: orgsetting
        @if [ -L orgsrc ] ; then \
                echo "Already orgsrc"; \