From: Takuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Date: Tue, 5 Aug 2014 01:17:25 +0000 (+0900)
Subject: Modifiyed mrcImagePixelDataGet: -om (output mode)
X-Git-Tag: v2.1.0p0020~10
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fv2.0.27p0011;p=eos%2Fbase.git

Modifiyed mrcImagePixelDataGet: -om (output mode)
	modified:   mrcImagePixelDataGet
	modified:   src/Tools/mrcImage/mrcImagePixelDataGet/Config/OptionControlFile
	modified:   src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.c
---

diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImagePixelDataGet b/hostdepend/X86MAC64/bin/X86MAC64/mrcImagePixelDataGet
index 67e9da97d1..c4e86f80c6 100755
Binary files a/hostdepend/X86MAC64/bin/X86MAC64/mrcImagePixelDataGet and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImagePixelDataGet differ
diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImagePixelDataGet/src/X86MAC64/mrcImagePixelDataGet b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImagePixelDataGet/src/X86MAC64/mrcImagePixelDataGet
index 67e9da97d1..c4e86f80c6 100755
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImagePixelDataGet/src/X86MAC64/mrcImagePixelDataGet and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImagePixelDataGet/src/X86MAC64/mrcImagePixelDataGet differ
diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 61a764e902..f731d9e1b9 100755
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -151,3 +151,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/Config/OptionControlFile b/src/Tools/mrcImage/mrcImagePixelDataGet/Config/OptionControlFile
index 088699d70b..68e67fe6f3 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/Config/OptionControlFile
@@ -8,4 +8,5 @@
 "-In","-In[put]","Input:eosPoint","Optional","1","1","InCoord","inFile::ASCII","stdin"
 "-cuda","-cuda","cudaDeviceID","Optional","1","1","cudaDeviceID","Integer","0"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
-"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
+"-om","-o[utput]m[ode]","Mode:Output","Optional","1","1","outMode","Integer","0"
+"-m","-m[ode]","Mode:Interpolation","Optional","1","1","mode","Integer","0"
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/Makefile b/src/Tools/mrcImage/mrcImagePixelDataGet/Makefile
deleted file mode 100755
index 4dbb018aca..0000000000
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-include ../../../Config/Define.inc
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-
-all:
-	cd src; make all; cd ..
-
-install:
-	cd src; make install; cd ..
-
-
-putSF:
-	if [ -f private ] ; \
-	then \
-		echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \
-	else \
-		cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \
-	fi
-
-put:
-	cd src; make put; cd ..
-
-clean:
-	cd src; make clean; cd ..
-
-depend:
-	cd src; make depend; cd ..
-
-check:
-	@if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
-		echo making directory; \
-		mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
-	fi
-	ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
-	@$(RM) src/Makefile
-	@echo "New src/Makefile" 
-	@$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
-	@cd src; touch $(OSTYPE)/.Depend; make depend
-
-cvsupdate::
-	cvs -d $(EOS_CVSROOT) update -d 
-
-cvscommit::
-	cvs -d $(EOS_CVSROOT) commit
-
-backup:
-	@cd ../../../..;     \
-	echo $(OBJECTNAME) ; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config	; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-	tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-
-backup-all:
-	@cd ../../../..;     \
-	echo $(OBJECTNAME) ; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config	; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-	tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-	
-distribute:
-	cd ../../../..;     \
-	echo $(OBJECTNAME) ; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config	; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-	tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-	
-distribute-all:
-	@cd ../../../..;     \
-	echo $(OBJECTNAME) ; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config	; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-	tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-
-eosintroduce:
-	${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ 
-
-include Config/Target.inc
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/Makefile b/src/Tools/mrcImage/mrcImagePixelDataGet/Makefile
new file mode 120000
index 0000000000..ef1f6300ba
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/Makefile
@@ -0,0 +1 @@
+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/inc/mrcImagePixelDataGet.h b/src/Tools/mrcImage/mrcImagePixelDataGet/inc/mrcImagePixelDataGet.h
index 47fa05462e..6c6c7f75c6 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/inc/mrcImagePixelDataGet.h
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/inc/mrcImagePixelDataGet.h
@@ -41,6 +41,9 @@ typedef struct mrcImagePixelDataGetInfo {
     char* configFile;
     FILE* fptconfigFile;
     
+    long flagoutMode;
+    long outMode;
+    
     long flagmode;
     long mode;
     
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/argCheck.c b/src/Tools/mrcImage/mrcImagePixelDataGet/src/argCheck.c
index 92419025e4..e2fec55842 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/argCheck.c
@@ -116,6 +116,17 @@ argCheck(mrcImagePixelDataGetInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("om") {
+                    if(i+1<argc) {
+                        info->outMode = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagoutMode++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("m") {
                     if(i+1<argc) {
                         info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/init.c b/src/Tools/mrcImage/mrcImagePixelDataGet/src/init.c
index 5f046f4b86..e560420045 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/init.c
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/init.c
@@ -20,6 +20,7 @@ init0(mrcImagePixelDataGetInfo* info)
     info->fptInCoord = stdin;    info->flagInCoord = 0;
     info->cudaDeviceID = 0;    info->flagcudaDeviceID = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
+    info->outMode = 0;    info->flagoutMode = 0;
     info->mode = 0;    info->flagmode = 0;
 }
 
@@ -61,6 +62,9 @@ init1(mrcImagePixelDataGetInfo* info)
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }
     
+    if(info->flagoutMode) {
+    }
+    
     if(info->flagmode) {
     }
     
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.c b/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.c
index 2511b36fd1..828844f658 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.c
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.c
@@ -15,7 +15,7 @@
 #define GLOBAL_DECLARATION
 #include "../inc/config.h"
 
-#define DEBUG
+#undef DEBUG
 #include "genUtil.h"
 #include "Memory.h"
 #include "mrcImage.h"
@@ -87,10 +87,16 @@ main(int argc, char* argv[])
 		}
 		mrcPixelsDataGet(dataArray, inCoord, nPixel, &in, mrcPixelRePart, info.mode);
 		for(i=0; i<nPixel; i++) {
+			if((info.outMode&0x1)!=0) {
+				fprintf(info.fptOut, "%f %f %f ", inCoord[i].x, inCoord[i].y, inCoord[i].z);
+			}
 			fprintf(info.fptOut, "%f\n", dataArray[i]);
 		}
 	} else {
 		mrcPixelDataGet(&in, info.x, info.y, info.z, &data, mrcPixelRePart, info.mode);
+		if((info.outMode&0x1)!=0) {
+			fprintf(info.fptOut, "%f %f %f ", info.x, info.y, info.z);
+		}
 		fprintf(info.fptOut, "%lf\n", data);
 	}
 	exit(EXIT_SUCCESS);
@@ -100,4 +106,9 @@ void
 additionalUsage()
 {
 	fprintf(stderr, "----- Additional Usage -----\n");
+	fprintf(stderr, "-m InterpolationMode ; refer to mrcImageROI \n");
+	fprintf(stderr, "-om outputMode\n");
+	fprintf(stderr, " +1 : with coordinates\n");
+
+
 }
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.html b/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.html
index c338ff9e82..19b6822d42 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.html
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.html
@@ -1 +1,27 @@
-/bin/bash: mrcImagePixelDataGet: そのようなファイルやディレクトリはありません
+<HTML>
+<HEAD>
+<TITLE>mrcImagePixelDataGet</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImagePixelDataGet</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImagePixelDataGet
+Options:
+    [-i[nput]            In                  (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: mrcImage
+    [-o[utput]           Out                 (stdout    ).as(outFile::ASCII      ) ] :Optional  :OutputDataFile
+    [-x                  x                   (0.0       ).as(Real                ) ] :Optional  :Input: x
+    [-y                  y                   (0.0       ).as(Real                ) ] :Optional  :Input: y
+    [-z                  z                   (0.0       ).as(Real                ) ] :Optional  :Input: z
+    [-In[put]            InCoord             (stdin     ).as(inFile::ASCII       ) ] :Optional  :Input:eosPoint
+    [-cuda               cudaDeviceID        (0         ).as(Integer             ) ] :Optional  :cudaDeviceID
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-o[utput]m[ode]     outMode             (0         ).as(Integer             ) ] :Optional  :Mode:Output
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode:Interpolation
+----- Additional Usage -----
+-m InterpolationMode ; refer to mrcImageROI 
+-om outputMode
+ +1 : with coordinates
+</PRE>
+</BODY>
+</HTML>
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.pane b/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.pane
index 053cdfc1d6..d57dfe568b 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.pane
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/mrcImagePixelDataGet.pane
@@ -15,7 +15,8 @@
         -I 1 0 1 0 0 1 -1x1+1+9.000000 ' ' 'InCoord' 'Input:eosPoint' In
         -i 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'cudaDeviceID' 'cudaDeviceID' cuda
         -I 1 0 1 0 0 1 -1x1+1+12.000000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+13.500000 0 0 0 0 0 'mode' 'Mode' m
+        -i 1 0 1 0 0 -1x1+1+13.500000 0 0 0 0 0 'outMode' 'Mode:Output' om
+        -i 1 0 1 0 0 -1x1+1+15.000000 0 0 0 0 0 'mode' 'Mode:Interpolation' m
     -E
   -E
 -E
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile b/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile
index 6e1fc5d9e7..8509d81ad7 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/test/Makefile
@@ -17,6 +17,7 @@ exec:
 	time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out4 -In data/test.inCoord -m 1
 	time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out5 -In data/test.inCoord -m 0 -cuda 0
 	time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out6 -In data/test.inCoord -m 1 -cuda 0 
+	time ../$(OSTYPE)/$(OBJECTNAME)  -i data/test.in -o data/test.out7 -In data/test.inCoord -om 1 -m 2 
 	@echo "----- Calc check -----"		
 
 clean:
diff --git a/src/Tools/mrcImage/mrcImagePixelDataGet/src/usage.c b/src/Tools/mrcImage/mrcImagePixelDataGet/src/usage.c
index 965a4ff64f..f129cf4986 100755
--- a/src/Tools/mrcImage/mrcImagePixelDataGet/src/usage.c
+++ b/src/Tools/mrcImage/mrcImagePixelDataGet/src/usage.c
@@ -15,7 +15,8 @@ usage(char* thisProgram)
     fprintf(stderr, "    [-In[put]            InCoord             (stdin     ).as(inFile::ASCII       ) ] :Optional  :Input:eosPoint\n");
     fprintf(stderr, "    [-cuda               cudaDeviceID        (0         ).as(Integer             ) ] :Optional  :cudaDeviceID\n");
     fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
+    fprintf(stderr, "    [-o[utput]m[ode]     outMode             (0         ).as(Integer             ) ] :Optional  :Mode:Output\n");
+    fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode:Interpolation\n");
     additionalUsage();
 }