OSDN > Find Software > Scientific/Engineering > Information Analysis > Eos-Image Analysis Environment > SCM > git > base > Commit

Eos-Image Analysis Environment
Fork
others2
data
tutorial
optional
others
hostdependX86LINUX64
hostdependX86MAC64
hostdependX86LINUX64ICC
hostdependOTHERS
base
zephyr
hostdependARM64MAC64

R/O
HTTP
SSH
HTTPS

base: Commit

This repository is a base of Eos.

Commit MetaInfo

Revision	d8469a404f45e7f04ae5a5be2f45c478b6cf5d5d (tree)
Time	2015-09-16 22:46:19
Author	Takuo Yasunaga <yasunaga@bio....>
Commiter	Takuo Yasunaga

Log Message

Bug fixed:
modified: src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c
modified: src/Tools/mrcImage/mrcImageProjection/src/mrcImageProjection.c

Change Summary

modified: src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c (diff)
modified: src/Tools/mrcImage/mrcImageProjection/src/mrcImageProjection.c (diff)
modified: src/Tools/mrcImage/mrcImageProjection/src/mrcImageProjection.html (diff)
add: src/Tools/mrcImage/mrcImageProjection/src/test/Makefile (diff)
add: src/Tools/mrcImage/mrcImageProjection/src/test/data (diff)

Incremental Difference

--- a/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c

+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageProjection.c

		@@ -27,14 +27,14 @@ lmrcImageProjection( mrcImage* out, mrcImage* in,
27	27	out->HeaderN.y = in->HeaderN.y;
28	28	out->HeaderN.z = 1.0;
29	29	mrcInit(out, NULL);
	30	+ for(z=0; z<in->HeaderN.z; z++) {
	31	+ for(y=0; y<in->HeaderN.y; y++) {
30	32	for(x=0; x<in->HeaderN.x; x++) {
31		- for(y=0; y<in->HeaderN.y; y++) {
32		- for(z=0; z<in->HeaderN.z; z++) {
33		- mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
	33	+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
34	34	mrcPixelDataGet(out, x, y, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest);
35	35	mrcPixelDataSet(out, x, y, 0.0, dataout+data, mrcPixelRePart);
36		- }
37		- }
	36	+ }
	37	+ }
38	38	}
39	39	break;
40	40	}

		@@ -44,31 +44,31 @@ lmrcImageProjection( mrcImage* out, mrcImage* in,
44	44	out->HeaderN.y = in->HeaderN.z;
45	45	out->HeaderN.z = 1;
46	46	mrcInit(out, NULL);
	47	+ for(z=0; z<in->HeaderN.z; z++) {
	48	+ for(y=0; y<in->HeaderN.y; y++) {
47	49	for(x=0; x<in->HeaderN.x; x++) {
48		- for(y=0; y<in->HeaderN.y; y++) {
49		- for(z=0; z<in->HeaderN.z; z++) {
50		- mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
	50	+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
51	51	mrcPixelDataGet(out, y, z, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest);
52	52	mrcPixelDataSet(out, y, z, 0.0, dataout+data, mrcPixelRePart);
53		- }
54		- }
	53	+ }
	54	+ }
55	55	}
56	56	break;
57	57	}
58		- case 2: { // along z-axis
	58	+ case 2: { // along y-axis
59	59	out->Header = in->Header;
60	60	out->HeaderN.x = in->HeaderN.z;
61	61	out->HeaderN.y = in->HeaderN.x;
62	62	out->HeaderN.z = 1.0;
63	63	mrcInit(out, NULL);
	64	+ for(z=0; z<in->HeaderN.z; z++) {
	65	+ for(y=0; y<in->HeaderN.y; y++) {
64	66	for(x=0; x<in->HeaderN.x; x++) {
65		- for(y=0; y<in->HeaderN.y; y++) {
66		- for(z=0; z<in->HeaderN.z; z++) {
67		- mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
	67	+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
68	68	mrcPixelDataGet(out, z, x, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest);
69	69	mrcPixelDataSet(out, z, x, 0.0, dataout+data, mrcPixelRePart);
70		- }
71		- }
	70	+ }
	71	+ }
72	72	}
73	73	break;
74	74	}

		@@ -78,14 +78,14 @@ lmrcImageProjection( mrcImage* out, mrcImage* in,
78	78	out->HeaderN.y = 1.0;
79	79	out->HeaderN.z = 1.0;
80	80	mrcInit(out, NULL);
	81	+ for(z=0; z<in->HeaderN.z; z++) {
	82	+ for(y=0; y<in->HeaderN.y; y++) {
81	83	for(x=0; x<in->HeaderN.x; x++) {
82		- for(y=0; y<in->HeaderN.y; y++) {
83		- for(z=0; z<in->HeaderN.z; z++) {
84		- mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
	84	+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
85	85	mrcPixelDataGet(out, y, 0.0, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest);
86	86	mrcPixelDataSet(out, y, 0.0, 0.0, dataout+data, mrcPixelRePart);
87		- }
88		- }
	87	+ }
	88	+ }
89	89	}
90	90	break;
91	91	}

		@@ -94,30 +94,31 @@ lmrcImageProjection( mrcImage* out, mrcImage* in,
94	94	out->HeaderN.y = 1.0;
95	95	out->HeaderN.z = 1.0;
96	96	mrcInit(out, NULL);
	97	+ for(z=0; z<in->HeaderN.z; z++) {
	98	+ for(y=0; y<in->HeaderN.y; y++) {
97	99	for(x=0; x<in->HeaderN.x; x++) {
98		- for(y=0; y<in->HeaderN.y; y++) {
99		- for(z=0; z<in->HeaderN.z; z++) {
100		- mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
	100	+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
101	101	mrcPixelDataGet(out, x, 0.0, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest);
102	102	mrcPixelDataSet(out, x, 0.0, 0.0, dataout+data, mrcPixelRePart);
103		- }
104		- }
	103	+ }
	104	+ }
105	105	}
106	106	break;
107	107	}
108	108	case 5: { // to z-axis
109	109	out->Header = in->Header;
	110	+ out->HeaderN.x = out->HeaderN.z;
110	111	out->HeaderN.y = 1.0;
111	112	out->HeaderN.z = 1.0;
112	113	mrcInit(out, NULL);
	114	+ for(z=0; z<in->HeaderN.z; z++) {
	115	+ for(y=0; y<in->HeaderN.y; y++) {
113	116	for(x=0; x<in->HeaderN.x; x++) {
114		- for(y=0; y<in->HeaderN.y; y++) {
115		- for(z=0; z<in->HeaderN.z; z++) {
116		- mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
	117	+ mrcPixelDataGet(in, x, y, z, &data, mrcPixelRePart, mrcPixelHowNearest);
117	118	mrcPixelDataGet(out, z, 0.0, 0.0, &dataout, mrcPixelRePart, mrcPixelHowNearest);
118	119	mrcPixelDataSet(out, z, 0.0, 0.0, dataout+data, mrcPixelRePart);
119		- }
120		- }
	120	+ }
	121	+ }
121	122	}
122	123	break;
123	124	}

--- a/src/Tools/mrcImage/mrcImageProjection/src/mrcImageProjection.c

+++ b/src/Tools/mrcImage/mrcImageProjection/src/mrcImageProjection.c

		@@ -49,9 +49,9 @@ additionalUsage()
49	49	fprintf(stderr, "----- Mode -----\n");
50	50	fprintf(stderr, "0: x-y sufacae along z-axis [3D to 2D]\n");
51	51	fprintf(stderr, "1: y-z sufacae along x-axis [3D to 2D]\n");
52		- fprintf(stderr, "2: x-z sufacae along y-axis [3D to 2D]\n");
53		- fprintf(stderr, "3: x-y sufacae to y-axis [2D/3D to 1D]\n");
54		- fprintf(stderr, "4: x-y sufacae to x-axis [2D/3D to 1D]\n");
	52	+ fprintf(stderr, "2: z-x sufacae along y-axis [3D to 2D]\n");
	53	+ fprintf(stderr, "3: z-x sufacae to y-axis [2D/3D to 1D]\n");
	54	+ fprintf(stderr, "4: y-z sufacae to x-axis [2D/3D to 1D]\n");
55	55	fprintf(stderr, "5: x-y sufacae to z-axis [2D/3D to 1D]\n");
56	56	}
57	57

--- a/src/Tools/mrcImage/mrcImageProjection/src/mrcImageProjection.html

+++ b/src/Tools/mrcImage/mrcImageProjection/src/mrcImageProjection.html

		@@ -15,9 +15,9 @@ Options:
15	15	----- Mode -----
16	16	0: x-y sufacae along z-axis [3D to 2D]
17	17	1: y-z sufacae along x-axis [3D to 2D]
18		-2: x-z sufacae along y-axis [3D to 2D]
19		-3: x-y sufacae to y-axis [2D/3D to 1D]
20		-4: x-y sufacae to x-axis [2D/3D to 1D]
	18	+2: z-x sufacae along y-axis [3D to 2D]
	19	+3: z-x sufacae to y-axis [2D/3D to 1D]
	20	+4: y-z sufacae to x-axis [2D/3D to 1D]
21	21	5: x-y sufacae to z-axis [2D/3D to 1D]
22	22	</PRE>
23	23	</BODY>

--- /dev/null

+++ b/src/Tools/mrcImage/mrcImageProjection/src/test/Makefile

		@@ -0,0 +1,22 @@
	1	+include ../../Config/Define.inc
	2	+include ../../../Config/Define.inc
	3	+include ../../../../Config/Define.inc
	4	+include ../../../../../Config/Define.inc
	5	+
	6	+all: help exec
	7	+
	8	+help:
	9	+ @echo "----- Help Message Check -----"
	10	+ @../$(OSTYPE)/$(OBJECTNAME) -h
	11	+
	12	+exec:
	13	+ @echo "----- Execution Check -----"
	14	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.prj.0 -m 0
	15	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.prj.1 -m 1
	16	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.prj.2 -m 2
	17	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.prj.3 -m 3
	18	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.prj.4 -m 4
	19	+ ../$(OSTYPE)/$(OBJECTNAME) -i data/test.bin -o data/test.prj.5 -m 5
	20	+ @echo "----- Calc check -----"
	21	+
	22	+clean: