OSDN -- Develop and Download Open Source Software
  • R/O
  • HTTP
  • SSH
  • HTTPS
Fork

base: Commit

This repository is a base of Eos.


Commit MetaInfo

Revisionc96675f51bdf24764ea3f22eda4872525ec5e14f (tree)
Time2014-06-21 18:18:51
AuthorTakuo Yasunaga <yasunaga@bio....>
CommiterTakuo Yasunaga

Log Message

Create a new command:
new file: bin/mrcImageDividedByFile
new file: hostdepend/X86MAC64/bin/X86MAC64/mrcImageDividedByFile
Bug fixed: Devided -> Divided : Spell-missing
modified: include/mrcImage.h
modified: src/Objects/DataManip/mrcImage/inc/mrcImage.h
modified: src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c
modified: src/Objects/DataManip/mrcImage/src/lmrcImageMontageCreate.c
modified: src/Objects/DataManip/mrcImage/src/mrcImageOperation.c
modified: src/Tools/Config/Define.inc
new file: src/Tools/mrcImage/mrcImageDividedByFile/*

Change Summary

Incremental Difference

--- /dev/null
+++ b/bin/mrcImageDividedByFile
@@ -0,0 +1 @@
1+../sbin/MachineIndependent
\ No newline at end of file
Binary files /dev/null and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageDividedByFile differ
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a differ
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo differ
Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo differ
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a differ
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a differ
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAverage.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAverage.sharedo differ
Binary files a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo and b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo differ
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/.Depend
@@ -0,0 +1,199 @@
1+argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
2+ /usr/include/sys/_symbol_aliasing.h \
3+ /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
4+ /usr/include/AvailabilityInternal.h /usr/include/_types.h \
5+ /usr/include/sys/_types.h /usr/include/machine/_types.h \
6+ /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \
7+ /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \
8+ /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
9+ /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
10+ /usr/include/stdlib.h /usr/include/sys/wait.h \
11+ /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
12+ /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
13+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
14+ /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
15+ /usr/include/mach/i386/_structs.h \
16+ /usr/include/sys/_types/_sigaltstack.h \
17+ /usr/include/sys/_types/_ucontext.h \
18+ /usr/include/sys/_types/_pthread_attr_t.h \
19+ /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
20+ /usr/include/sys/resource.h \
21+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
22+ /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
23+ /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
24+ /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
25+ /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
26+ /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
27+ /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
28+ /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
29+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
30+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
31+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
32+ /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
33+ /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
34+ /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \
35+ /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \
36+ /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \
37+ ../inc/../inc/mrcImageDividedByFile.h \
38+ /Users/tacyas/Eos/include/genUtil.h /Users/tacyas/Eos/include/File.h \
39+ /Users/tacyas/Eos/include/Memory.h \
40+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \
41+ /usr/include/limits.h /usr/include/machine/limits.h \
42+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
43+ /usr/include/sys/syslimits.h
44+init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
45+ /usr/include/sys/_symbol_aliasing.h \
46+ /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
47+ /usr/include/AvailabilityInternal.h /usr/include/_types.h \
48+ /usr/include/sys/_types.h /usr/include/machine/_types.h \
49+ /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \
50+ /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \
51+ /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
52+ /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
53+ /usr/include/stdlib.h /usr/include/sys/wait.h \
54+ /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
55+ /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
56+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
57+ /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
58+ /usr/include/mach/i386/_structs.h \
59+ /usr/include/sys/_types/_sigaltstack.h \
60+ /usr/include/sys/_types/_ucontext.h \
61+ /usr/include/sys/_types/_pthread_attr_t.h \
62+ /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
63+ /usr/include/sys/resource.h \
64+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
65+ /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
66+ /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
67+ /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
68+ /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
69+ /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
70+ /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
71+ /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
72+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
73+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
74+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
75+ /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
76+ /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
77+ /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \
78+ /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \
79+ /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \
80+ ../inc/../inc/mrcImageDividedByFile.h \
81+ /Users/tacyas/Eos/include/genUtil.h /Users/tacyas/Eos/include/File.h \
82+ /Users/tacyas/Eos/include/Memory.h \
83+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \
84+ /usr/include/limits.h /usr/include/machine/limits.h \
85+ /usr/include/i386/limits.h /usr/include/i386/_limits.h \
86+ /usr/include/sys/syslimits.h
87+mrcImageDividedByFile.o: mrcImageDividedByFile.c /usr/include/stdio.h \
88+ /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \
89+ /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
90+ /usr/include/AvailabilityInternal.h /usr/include/_types.h \
91+ /usr/include/sys/_types.h /usr/include/machine/_types.h \
92+ /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \
93+ /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \
94+ /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
95+ /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
96+ /usr/include/stdlib.h /usr/include/sys/wait.h \
97+ /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
98+ /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
99+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
100+ /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
101+ /usr/include/mach/i386/_structs.h \
102+ /usr/include/sys/_types/_sigaltstack.h \
103+ /usr/include/sys/_types/_ucontext.h \
104+ /usr/include/sys/_types/_pthread_attr_t.h \
105+ /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
106+ /usr/include/sys/resource.h \
107+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
108+ /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
109+ /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
110+ /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
111+ /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
112+ /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
113+ /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
114+ /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
115+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
116+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
117+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
118+ /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
119+ /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
120+ /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \
121+ /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \
122+ /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \
123+ ../inc/../inc/mrcImageDividedByFile.h \
124+ /Users/tacyas/Eos/include/genUtil.h \
125+ /Users/tacyas/Eos/include/mrcImage.h \
126+ /Users/tacyas/Eos/include/ctfInfo.h /Users/tacyas/Eos/include/Vector.h \
127+ /Users/tacyas/Eos/include/Matrix3D.h /Users/tacyas/Eos/include/Array.h
128+usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
129+ /usr/include/sys/_symbol_aliasing.h \
130+ /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
131+ /usr/include/AvailabilityInternal.h /usr/include/_types.h \
132+ /usr/include/sys/_types.h /usr/include/machine/_types.h \
133+ /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \
134+ /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \
135+ /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
136+ /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
137+ /usr/include/stdlib.h /usr/include/sys/wait.h \
138+ /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
139+ /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
140+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
141+ /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
142+ /usr/include/mach/i386/_structs.h \
143+ /usr/include/sys/_types/_sigaltstack.h \
144+ /usr/include/sys/_types/_ucontext.h \
145+ /usr/include/sys/_types/_pthread_attr_t.h \
146+ /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
147+ /usr/include/sys/resource.h \
148+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
149+ /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
150+ /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
151+ /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
152+ /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
153+ /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
154+ /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
155+ /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
156+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
157+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
158+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
159+ /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
160+ /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
161+ /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \
162+ /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \
163+ ../inc/config.h ../inc/../inc/mrcImageDividedByFile.h
164+util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
165+ /usr/include/sys/_symbol_aliasing.h \
166+ /usr/include/sys/_posix_availability.h /usr/include/Availability.h \
167+ /usr/include/AvailabilityInternal.h /usr/include/_types.h \
168+ /usr/include/sys/_types.h /usr/include/machine/_types.h \
169+ /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \
170+ /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \
171+ /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \
172+ /usr/include/secure/_stdio.h /usr/include/secure/_common.h \
173+ /usr/include/stdlib.h /usr/include/sys/wait.h \
174+ /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \
175+ /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \
176+ /usr/include/machine/signal.h /usr/include/i386/signal.h \
177+ /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \
178+ /usr/include/mach/i386/_structs.h \
179+ /usr/include/sys/_types/_sigaltstack.h \
180+ /usr/include/sys/_types/_ucontext.h \
181+ /usr/include/sys/_types/_pthread_attr_t.h \
182+ /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \
183+ /usr/include/sys/resource.h \
184+ /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \
185+ /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \
186+ /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \
187+ /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \
188+ /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \
189+ /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \
190+ /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \
191+ /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \
192+ /usr/include/machine/endian.h /usr/include/i386/endian.h \
193+ /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \
194+ /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \
195+ /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \
196+ /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \
197+ /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \
198+ /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \
199+ ../inc/config.h ../inc/../inc/mrcImageDividedByFile.h
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/Makefile
@@ -0,0 +1,114 @@
1+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc
2+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc
3+include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc
4+include $(EOS_HOME)/src/Config/DefineTool.inc
5+
6+LIBFILES = \
7+ $(LIBPREFIX)EosObjects$(LIBSUFFIX)
8+
9+LIBFILESDEBUG = \
10+ $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX)
11+
12+SRCC = \
13+ $(OBJECTNAME).c \
14+ init.c \
15+ argCheck.c \
16+ usage.c \
17+ util.c
18+
19+SRCCXX = \
20+ $(OBJECTNAME).cc \
21+ init.cc \
22+ argCheck.cc \
23+ usage.cc \
24+ util.cc
25+
26+MODULES = \
27+ $(OBJECTNAME).o \
28+ init.o \
29+ argCheck.o \
30+ usage.o \
31+ util.o
32+
33+REALMODULES = \
34+ $(OSTYPE)/$(OBJECTNAME).o \
35+ $(OSTYPE)/init.o \
36+ $(OSTYPE)/argCheck.o \
37+ $(OSTYPE)/usage.o \
38+ $(OSTYPE)/util.o
39+
40+MODULESDEBUG = \
41+ $(OBJECTNAME).debugo \
42+ init.debugo \
43+ argCheck.debugo \
44+ usage.debugo \
45+ util.debugo
46+
47+MODULESCUDAGDB = \
48+ $(OBJECTNAME).cudagdb.o \
49+ init.cudagdb.o \
50+ argCheck.cudagdb.o \
51+ usage.cudagdb.o \
52+ util.cudagdb.o
53+
54+REALMODULESDEBUG = \
55+ $(OSTYPE)/$(OBJECTNAME).debugo \
56+ $(OSTYPE)/init.debugo \
57+ $(OSTYPE)/argCheck.debugo \
58+ $(OSTYPE)/usage.debugo \
59+ $(OSTYPE)/util.debugo
60+
61+
62+$(OBJECTNAME): $(MODULES) $(LIBFILES)
63+ @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
64+ then \
65+ echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
66+ $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
67+ fi
68+ @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
69+ then \
70+ echo $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
71+ $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
72+ fi
73+ @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
74+ then \
75+ echo "MICO"; \
76+ echo $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
77+ $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
78+ fi
79+ @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
80+ then \
81+ echo $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ; \
82+ $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ; \
83+ fi
84+
85+
86+$(OBJECTNAME).debug: $(MODULESDEBUG) $(LIBFILESDEBUG)
87+ @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \
88+ then \
89+ echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
90+ $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
91+ fi
92+ @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \
93+ then \
94+ echo $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
95+ $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
96+ fi
97+ @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \
98+ then \
99+ echo "MICO"; \
100+ echo $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
101+ $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
102+ fi
103+ @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
104+ then \
105+ echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
106+ $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \
107+ fi
108+
109+$(OBJECTNAME).cudagdb: $(MODULESCUDAGDB) $(LIBFILESDEBUG)
110+ echo $(NVCC) "$(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@"
111+ $(NVCC) $(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@
112+
113+include ./.Depend
114+include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Target.inc
--- /dev/null
+++ b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/X86MAC64
@@ -0,0 +1 @@
1+../../../../../hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64
\ No newline at end of file
Binary files /dev/null and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/mrcImageDividedByFile differ
--- a/include/mrcImage.h
+++ b/include/mrcImage.h
@@ -716,11 +716,11 @@ extern int IsFFT(mrcImage* mrc, char* message, mrcImageParaTypeInteger mode);
716716 extern void mrcImageInfoSet(mrcImage* mrc, FILE* fptIn, FILE* fptOut, long mode);
717717
718718 /* in mrcImageOperation.c */
719-extern void lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2);
719+extern void lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2);
720720 extern void lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se);
721721 extern void lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig);
722-extern void lmrcImageDevidedByReal(mrcImage* img, double d);
723-extern void lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d);
722+extern void lmrcImageDividedByReal(mrcImage* img, double d);
723+extern void lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d);
724724 extern void lmrcImageAddedByReal(mrcImage* img, double d);
725725 extern void lmrcImageStdDev(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num);
726726 extern void lmrcImageStdErr(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num);
--- a/src/Objects/DataManip/mrcImage/doc/mrcImage.html
+++ b/src/Objects/DataManip/mrcImage/doc/mrcImage.html
@@ -103,305 +103,6 @@
103103 <H2>Information from source codes</H2>
104104 </A>
105105 <PRE>
106-../src/fftn.c:
107-
108-../src/lmrcFETnormalizeBySD.c:
109-
110-../src/lmrcFFTExpression.c:
111-
112-../src/lmrcFFTFGconj.c:
113-
114-../src/lmrcFFTFxG.c:
115-
116-../src/lmrcFFTInfo.c:
117-
118-../src/lmrcImage3DWindowing.c:
119-
120-../src/lmrcImageAddValue.c:
121-
122-../src/lmrcImageAsProbability.c:
123-
124-../src/lmrcImageAverage.c:
125-
126-../src/lmrcImageBandPassFilter.c:
127-
128-../src/lmrcImageBilateralFilter.c:
129-
130-../src/lmrcImageBinarization.c:
131-
132-../src/lmrcImageBoundaryInfo.c:
133-
134-../src/lmrcImageCalcArea.c:
135-
136-../src/lmrcImageCenterGet.c:
137-
138-../src/lmrcImageCentre.c:
139-
140-../src/lmrcImageClosing.c:
141-
142-../src/lmrcImageClusterAnalysis.c:
143-
144-../src/lmrcImageCommonLine.c:
145-
146-../src/lmrcImageConnection.c:
147-
148-../src/lmrcImageConnectivityNumberCalc.c:
149-
150-../src/lmrcImageContourSurface.c:
151-
152-../src/lmrcImageContraction.c:
153-
154-../src/lmrcImageCorrelation.c:
155- $lmrcImageEuclidDistanceCalc: Calculate Euclid distance between two images $
156- $arg: in1: input mrcImage1 $
157- $arg: in2: input mrcImage2 $
158- $arg: mode: input int $
159- $mode: 0 Sum of SQR $
160- $mode: 1 Distance $
161- $return: EuclidDistance $
162-
163-../src/lmrcImageCorrelationinSpace.c:
164-
165-../src/lmrcImageCorrelationPVM.c:
166-
167-../src/lmrcImageCorrelationWithCTFCompensation.c:
168-
169-../src/lmrcImageCrystalCreate.c:
170-
171-../src/lmrcImageCTFCompensation.c:
172-
173-../src/lmrcImageCTFDetermination.c:
174-
175-../src/lmrcImageCTFObservation.c:
176-
177-../src/lmrcImageCTFSN.c:
178-
179-../src/lmrcImageCVE.c:
180-
181-../src/lmrcImageDataMaxAndMinGetByImage.c:
182-
183-../src/lmrcImageDataStraightCopy.c:
184-
185-../src/lmrcImageDensity.c:
186-
187-../src/lmrcImageDensityInverse.c:
188-
189-../src/lmrcImageDensityNormalizationByImage.c:
190-
191-../src/lmrcImageDilation.c:
192-
193-../src/lmrcImageDistanceConversion.c:
194-
195-../src/lmrcImageEdgeAverage.c:
196-
197-../src/lmrcImageEdge.c:
198-
199-../src/lmrcImageErosion.c:
200-
201-../src/lmrcImageFeatureExtraction.c:
202-
203-../src/lmrcImageFeatureExtractionCoOccurrence.c:
204-
205-../src/lmrcImageFeatureExtractionRunLength.c:
206-
207-../src/lmrcImageFFT.c:
208-
209-../src/lmrcImageFilterCreate.c:
210-
211-../src/lmrcImageFirstNoiseReductionByRelaxation.c:
212-
213-../src/lmrcImageFOMCalc.c:
214-
215-../src/lmrcImageFourierPowerSpectrum.c:
216-
217-../src/lmrcImageFourierShellCorrelation.c:
218-
219-../src/lmrcImageHighlighting.c:
220-
221-../src/lmrcImageHighPassFilter.c:
222-
223-../src/lmrcImageLabeling.c:
224-
225-../src/lmrcImageLowPassFilter.c:
226-
227-../src/lmrcImageMasking.c:
228-
229-../src/lmrcImageMaxDataGet.c:
230-
231-../src/lmrcImageMirroring.c:
232- $lmrcImageMirroring: (mrcImage* out, mrcImage* in, lmrcImageMirroring mode) $
233-
234-../src/lmrcImageModeChange.c:
235-
236-../src/lmrcImageModelCreate.c:
237-
238-../src/lmrcImageMontageCreate.c:
239-
240-../src/lmrcImageMorphology.c:
241-
242-../src/lmrcImageMove.c:
243-
244-../src/lmrcImageMultiCTFCompensation.c:
245-
246-../src/lmrcImageMultiplying.c:
247-
248-../src/lmrcImageNormalizing.c:
249-
250-../src/lmrcImageOneLineSimilarityCalc.c:
251-
252-../src/lmrcImageOpening.c:
253-
254-../src/lmrcImagePad.c:
255-
256-../src/lmrcImagePartImageSegmentation.c:
257-
258-../src/lmrcImagePixelSummationOfProbabilityGetByImage.c:
259-
260-../src/lmrcImagePosterization.c:
261-
262-../src/lmrcImageProjection.c:
263-
264-../src/lmrcImageProportionalDensityLevelSetByImage.c:
265-
266-../src/lmrcImageRadialDistribution.c:
267-
268-../src/lmrcImageRhoFiltering.c:
269-
270-../src/lmrcImageROI2D.c:
271-
272-../src/lmrcImageROI3D.c:
273-
274-../src/lmrcImageROInotChangeHeaderLength.c:
275-
276-../src/lmrcImageRotation.c:
277-
278-../src/lmrcImageSamplingUnitChange.c:
279-
280-../src/lmrcImageSecondNoiseReductionByRelaxation.c:
281-
282-../src/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.c:
283-
284-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.c:
285-
286-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueSet.c:
287-
288-../src/lmrcImageSecondNoiseReductionByRelaxationQValueSet.c:
289-
290-../src/lmrcImageSecondNoiseReductionByRelaxationRValueSet.c:
291-
292-../src/lmrcImagesFTest.c:
293-
294-../src/lmrcImageShapePCA.c:
295-
296-../src/lmrcImageShift.c:
297-
298-../src/lmrcImageShrink.c:
299-
300-../src/lmrcImageSigmaCalculate.c:
301-
302-../src/lmrcImageSinogram.c:
303-
304-../src/lmrcImageSinogramCorrelation.c:
305-
306-../src/lmrcImageSinogramFFT.c:
307-
308-../src/lmrcImageSmoothing.c:
309-
310-../src/lmrcImageSolventFlattening.c:
311-
312-../src/lmrcImageSphere.c:
313-
314-../src/lmrcImageSplit.c:
315-
316-../src/lmrcImageSSDA.c:
317-
318-../src/lmrcImagesStatDataGet.c:
319-
320-../src/lmrcImagesTTest.c:
321-
322-../src/lmrcImageStudentCalculate.c:
323-
324-../src/lmrcImageSubtractionCalc.c:
325-
326-../src/lmrcImageSummationCalculate.c:
327-
328-../src/lmrcImagesVarianceAnalysis.c:
329-
330-../src/lmrcImagesVarianceMap.c:
331-
332-../src/lmrcImageSymmetryFind.c:
333-
334-../src/lmrcImageTfunction.c:
335-
336-../src/lmrcImageTrans.c:
337-
338-../src/lmrcImageTransformDescartesIntoPolar.c:
339-
340-../src/lmrcImageTriming.c:
341-
342-../src/lmrcImageVolumeCalc.c:
343-
344-../src/lmrcImageWindowing.c:
345-
346-../src/lmrcSinogramFET.c:
347-
348-../src/lmrcSinogramFETcalcWeight.c:
349-
350-../src/lmrcSinogramFETcorrelationMap.c:
351-
352-../src/lmrcSinogramFETnormalizedMap.c:
353-
354-../src/lmrcSinogramFETPCA.c:
355-
356-../src/lmrcSinogramFETreferredCorrelation.c:
357-
358-../src/lmrcSinogramFETsmoothParameterMatching.c:
359-
360-../src/mrcImageCheckFFT.c:
361-
362-../src/mrcImageCheckSameSize.c:
363-
364-../src/mrcImageCopy.c:
365-
366-../src/mrcImageDataSet.c:
367-
368-../src/mrcImageError.c:
369-
370-../src/mrcImagefuncmin.c:
371-
372-../src/mrcImageGet.c:
373-
374-../src/mrcImageInfo.c:
375-
376-../src/mrcImageInit.c:
377-
378-../src/mrcImageOperation.c:
379-
380-../src/mrcImagePrint.c:
381-
382-../src/mrcImagePVM.c:
383-
384-../src/mrcImageRead.c:
385-
386-../src/mrcImageSectionGet.c:
387-
388-../src/mrcImageSectionSet.c:
389-
390-../src/mrcImageSet.c:
391-
392-../src/mrcImageTailer.c:
393-
394-../src/mrcImageToIntImage.c:
395-
396-../src/mrcImageUtil.c:
397-
398-../src/mrcImageUtilityforVariance.c:
399-
400-../src/mrcImageWrite2.c:
401-
402-../src/mrcImageWrite.c:
403-
404-../src/mrcRefUtil.c:
405106 </PRE>
406107 <HR>
407108 <A NAME="include">
@@ -1126,11 +827,11 @@ extern int IsFFT(mrcImage* mrc, char* message, mrcImageParaTypeInteger mode);
1126827 extern void mrcImageInfoSet(mrcImage* mrc, FILE* fptIn, FILE* fptOut, long mode);
1127828
1128829 /* in mrcImageOperation.c */
1129-extern void lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2);
830+extern void lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2);
1130831 extern void lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se);
1131832 extern void lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig);
1132-extern void lmrcImageDevidedByReal(mrcImage* img, double d);
1133-extern void lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d);
833+extern void lmrcImageDividedByReal(mrcImage* img, double d);
834+extern void lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d);
1134835 extern void lmrcImageAddedByReal(mrcImage* img, double d);
1135836 extern void lmrcImageStdDev(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num);
1136837 extern void lmrcImageStdErr(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num);
--- a/src/Objects/DataManip/mrcImage/inc/mrcImage.h
+++ b/src/Objects/DataManip/mrcImage/inc/mrcImage.h
@@ -716,11 +716,11 @@ extern int IsFFT(mrcImage* mrc, char* message, mrcImageParaTypeInteger mode);
716716 extern void mrcImageInfoSet(mrcImage* mrc, FILE* fptIn, FILE* fptOut, long mode);
717717
718718 /* in mrcImageOperation.c */
719-extern void lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2);
719+extern void lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2);
720720 extern void lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se);
721721 extern void lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig);
722-extern void lmrcImageDevidedByReal(mrcImage* img, double d);
723-extern void lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d);
722+extern void lmrcImageDividedByReal(mrcImage* img, double d);
723+extern void lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d);
724724 extern void lmrcImageAddedByReal(mrcImage* img, double d);
725725 extern void lmrcImageStdDev(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num);
726726 extern void lmrcImageStdErr(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num);
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c
@@ -25,7 +25,7 @@ lmrcImageAverage(mrcImage* out, mrcImage* in, int n, int mode)
2525 lmrcImageAdd(out, &(in[i]), &num);
2626 }
2727 if(num==n) {
28- lmrcImageDevidedByReal(out, (double)num);
28+ lmrcImageDividedByReal(out, (double)num);
2929 } else {
3030 fprintf(stderr, "Something wrong: n %d != num %d\n", n, num);
3131 }
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageMontageCreate.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageMontageCreate.c
@@ -81,7 +81,7 @@ lmrcImageMontageCreate(mrcImage* out, mrcImage* in, int imageNum, lmrcImageMonta
8181
8282 0 1 2
8383
84- llinfo[shotID].avg[Edge][Devide]
84+ llinfo[shotID].avg[Edge][Divide]
8585
8686 */
8787 avg[6] = sqrt((llinfo[6].avg[0][1]/(llinfo[3].avg[2][1]/(llinfo[3].avg[1][0]/llinfo[4].avg[3][0])))
--- a/src/Objects/DataManip/mrcImage/src/mrcImageOperation.c
+++ b/src/Objects/DataManip/mrcImage/src/mrcImageOperation.c
@@ -60,7 +60,7 @@ lmrcImageConvolution(mrcImage* out, mrcImage* in, mrcImage* kernel, int mode)
6060 }
6161
6262 void
63-lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2)
63+lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2)
6464 {
6565 long ix, iy, iz;
6666 double ftmp1, ftmp2;
@@ -68,7 +68,7 @@ lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2)
6868 if( i1->HeaderN.x!=i2->HeaderN.x
6969 || i1->HeaderN.y!=i2->HeaderN.y
7070 || i1->HeaderN.z!=i2->HeaderN.z ) {
71- fprintf(stderr, "ImageSize is different in lmrcImageDevidedByImage\n");
71+ fprintf(stderr, "ImageSize is different in lmrcImageDividedByImage\n");
7272 exit(EXIT_FAILURE);
7373 }
7474 img->Header = i1->Header;
@@ -111,17 +111,17 @@ lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2)
111111 void
112112 lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se)
113113 {
114- lmrcImageDevidedByImage(t, avg, se);
114+ lmrcImageDividedByImage(t, avg, se);
115115 }
116116
117117 void
118118 lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig)
119119 {
120- lmrcImageDevidedByImage(sn, avg, sig);
120+ lmrcImageDividedByImage(sn, avg, sig);
121121 }
122122
123123 void
124-lmrcImageDevidedByReal(mrcImage* img, double d)
124+lmrcImageDividedByReal(mrcImage* img, double d)
125125 {
126126 long ix, iy, iz;
127127 double ftmp;
@@ -152,7 +152,7 @@ lmrcImageDevidedByReal(mrcImage* img, double d)
152152 }
153153
154154 void
155-lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d)
155+lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d)
156156 {
157157 long ix, iy, iz;
158158 double ftmp;
@@ -255,7 +255,7 @@ void
255255 lmrcImageStdErr(mrcImage* se, mrcImage* avg, mrcImage* avg2, long number)
256256 {
257257 lmrcImageStdDev(se, avg, avg2, number);
258- lmrcImageDevidedByReal(se, number);
258+ lmrcImageDividedByReal(se, number);
259259 }
260260
261261 void
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -126,3 +126,5 @@ WORLDNAME=Tools
126126 WORLDNAME=Tools
127127 WORLDNAME=Tools
128128 WORLDNAME=Tools
129+WORLDNAME=Tools
130+WORLDNAME=Tools
--- a/src/Tools/mrcImage/.Source
+++ b/src/Tools/mrcImage/.Source
@@ -95,6 +95,7 @@ mrcImageDisplayDensityAsTempFactor \
9595 mrcImageDistanceConversion \
9696 mrcImageDivideInfoForTomography \
9797 mrcImageDivideIntoTwoImages \
98+mrcImageDividedByFile \
9899 mrcImageEdgeEnhancement \
99100 mrcImageEdgeImageGet \
100101 mrcImageEnhancementWithFuzzySets \
--- a/src/Tools/mrcImage/.Source.org
+++ b/src/Tools/mrcImage/.Source.org
@@ -128,6 +128,7 @@ mrcImageHighPassFilter \
128128 mrcImageHighlighting \
129129 mrcImageInfo \
130130 mrcImageLabeling \
131+mrcImageLogicalOperation \
131132 mrcImageLowPassFilter \
132133 mrcImageMagnificationChange \
133134 mrcImageMake2DArrayImage \
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/Config/Define.inc
@@ -0,0 +1,4 @@
1+OBJECTNAME = mrcImageDividedByFile
2+EXTRA_LIB =
3+EXTRA_CCOPTS =
4+EXTRA_INC =
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/Config/OptionControlFile
@@ -0,0 +1,7 @@
1+# OptionControlFile
2+# FileFormat
3+"-i1","-i[nput]1","Input: In1","Essential","1","1","In1","inFile::mrcImage","NULL"
4+"-i2","-i[nput]2","Input: In2","Essential","1","1","In2","inFile::mrcImage","NULL"
5+"-o","-o[utput]","Output: In1/In2","Essential","1","1","Out","outFile::mrcImage","NULL"
6+"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
7+"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/Makefile
@@ -0,0 +1 @@
1+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/doc/Makefile
@@ -0,0 +1 @@
1+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/inc/config.h
@@ -0,0 +1,6 @@
1+#ifndef CONFIG_H
2+#define CONFIG_H
3+
4+#include "../inc/mrcImageDividedByFile.h"
5+
6+#endif /* CONFIG_H */
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/inc/mrcImageDividedByFile.h
@@ -0,0 +1,50 @@
1+#ifndef MRCIMAGEDIVIDEDBYFILE_H
2+#define MRCIMAGEDIVIDEDBYFILE_H
3+#include <stdio.h>
4+#include <stdlib.h>
5+
6+#define OPTION_FLAG '-'
7+#define OPTION_FLAG_POS (0)
8+#define OPTION_POS (1)
9+
10+
11+
12+
13+typedef struct mrcImageDividedByFileInfo {
14+ long flagRedirect;
15+
16+ long flagIn1;
17+ char* In1;
18+ FILE* fptIn1;
19+
20+ long flagIn2;
21+ char* In2;
22+ FILE* fptIn2;
23+
24+ long flagOut;
25+ char* Out;
26+ FILE* fptOut;
27+
28+ long flagconfigFile;
29+ char* configFile;
30+ FILE* fptconfigFile;
31+
32+ long flagmode;
33+ long mode;
34+
35+} mrcImageDividedByFileInfo;
36+#ifdef __cplusplus
37+extern "C" {
38+#endif
39+extern void argCheck(mrcImageDividedByFileInfo* info, int argc, char* avgv[]);
40+extern void khorosInit(int argc, char* avgv[]);
41+extern void init0(mrcImageDividedByFileInfo* info);
42+extern void init1(mrcImageDividedByFileInfo* info);
43+extern void usage(char* usage);
44+extern void additionalUsage(void);
45+extern void htmlBeforeUsage(char* usage);
46+extern void htmlAfterUsage(char* usage);
47+#ifdef __cplusplus
48+};
49+#endif
50+#endif /* MRCIMAGEDIVIDEDBYFILE_H */
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/Makefile
@@ -0,0 +1,427 @@
1+include ../Config/Define.inc
2+include ../../Config/Define.inc
3+include ../../../Config/Define.inc
4+include ../../../../Config/Define.inc
5+
6+EOSHOME=../../../../../
7+DSTDIR=$(EOSHOME)/bin
8+DSTDOC=$(EOSHOME)/doc
9+DSTTAR=$(EOSHOME)/tar
10+
11+INCFILES =
12+
13+LIBFILES = \
14+ $(LIBPREFIX)EosObjects$(LIBSUFFIX)
15+
16+LIBFILESDEBUG = \
17+ $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX)
18+
19+SRCC = \
20+ $(OBJECTNAME).c \
21+ init.c \
22+ argCheck.c \
23+ usage.c \
24+ util.c \
25+
26+SRCCXX = \
27+ $(OBJECTNAME).cc \
28+ init.cc \
29+ argCheck.cc \
30+ usage.cc \
31+ util.cc \
32+
33+MODULES = \
34+ $(OBJECTNAME).o \
35+ init.o \
36+ argCheck.o \
37+ usage.o \
38+ util.o \
39+
40+REALMODULES = \
41+ $(OSTYPE)/$(OBJECTNAME).o \
42+ $(OSTYPE)/init.o \
43+ $(OSTYPE)/argCheck.o \
44+ $(OSTYPE)/usage.o \
45+ $(OSTYPE)/util.o
46+
47+MODULESDEBUG = \
48+ $(OBJECTNAME).debugo \
49+ init.debugo \
50+ argCheck.debugo \
51+ usage.debugo \
52+ util.debugo \
53+
54+REALMODULESDEBUG = \
55+ $(OSTYPE)/$(OBJECTNAME).debugo \
56+ $(OSTYPE)/init.debugo \
57+ $(OSTYPE)/argCheck.debugo \
58+ $(OSTYPE)/usage.debugo \
59+ $(OSTYPE)/util.debugo
60+
61+
62+all: $(OSTYPE)/$(OBJECTNAME)
63+ if [ ! -L $(OSTYPE) ] ; then \
64+ moveHostdependent; \
65+ fi
66+
67+debug: $(OSTYPE)/$(OBJECTNAME).debug
68+
69+cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb
70+
71+
72+$(OSTYPE)/$(OBJECTNAME)::
73+ @$(RM) -f $(OSTYPE)/Makefile ; \
74+ $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
75+ cd $(OSTYPE); \
76+ $(MAKE) $(OBJECTNAME) WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
77+
78+$(OSTYPE)/$(OBJECTNAME).debug::
79+ @$(RM) -f $(OSTYPE)/Makefile ; \
80+ $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
81+ cd $(OSTYPE); \
82+ $(MAKE) $(OBJECTNAME).debug WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
83+
84+$(OSTYPE)/$(OBJECTNAME).cudagdb::
85+ @$(RM) -f $(OSTYPE)/Makefile ; \
86+ $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
87+ cd $(OSTYPE); \
88+ $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
89+
90+cvsupdate::
91+ cvs -d $(EOS_CVSROOT) update -d
92+
93+cvscommit::
94+ cvs -d $(EOS_CVSROOT) commit
95+
96+edit:
97+ @if [ -r $(OBJECTNAME).c ]; \
98+ then \
99+ sccsEdit $(OBJECTNAME).c; \
100+ else \
101+ echo "Source files are already editable"; \
102+ fi
103+ @if [ -r wish/$(OBJECTNAME).wish ]; \
104+ then \
105+ cd wish; sccsEdit $(OBJECTNAME).wish; \
106+ else \
107+ echo "Source files (wish) are already editable."; \
108+ fi
109+ @if [ -r ruby/$(OBJECTNAME).rb ]; \
110+ then \
111+ cd ruby; sccsEdit $(OBJECTNAME).rb; \
112+ else \
113+ echo "Source files (ruby) are already editable."; \
114+ fi
115+ @if [ -r perl/$(OBJECTNAME).pl ]; \
116+ then \
117+ cd perl; sccsEdit $(OBJECTNAME).pl ; \
118+ else \
119+ echo "Source files (perl) are already editable."; \
120+ fi
121+ @if [ -r ../Config/OptionControlFile ]; \
122+ then \
123+ cd ../Config; sccsEdit OptionControlFile; \
124+ else \
125+ echo "OptionControlFile are already editable."; \
126+ fi
127+
128+unedit:
129+ @if [ -w $(OBJECTNAME).c ]; \
130+ then \
131+ sccsUnedit $(OBJECTNAME).c; \
132+ else \
133+ echo "Source files are not editable"; \
134+ fi
135+ @if [ -w wish/$(OBJECTNAME).wish ]; \
136+ then \
137+ cd wish; sccsUnedit $(OBJECTNAME).wish; \
138+ else \
139+ echo "Source files (wish) are not editable."; \
140+ fi
141+ @if [ -w ruby/$(OBJECTNAME).rb]; \
142+ then \
143+ cd ruby; sccsUnedit $(OBJECTNAME).rb; \
144+ else \
145+ echo "Source files (ruby) are not editable."; \
146+ fi
147+ @if [ -w perl/$(OBJECTNAME).pl ]; \
148+ then \
149+ cd perl; sccsUnedit $(OBJECTNAME).pl ; \
150+ else \
151+ echo "Source files (ruby) are not editable."; \
152+ fi
153+ @if [ -w ../Config/OptionControlFile ]; \
154+ then \
155+ cd ../Config; sccsUnedit OptionControlFile; \
156+ else \
157+ echo "OptionControlFile are not editable."; \
158+ fi
159+
160+report:
161+ @if [ -r $(OBJECTNAME).c ]; \
162+ then \
163+ sccsReport $(OBJECTNAME).c; \
164+ else \
165+ echo "Source files are already editable"; \
166+ fi
167+ @if [ -r wish/$(OBJECTNAME).wish ]; \
168+ then \
169+ cd wish; sccsReport $(OBJECTNAME).wish; \
170+ else \
171+ echo "Source files (wish) are already editable."; \
172+ fi
173+ @if [ -r ruby/$(OBJECTNAME).rb ]; \
174+ then \
175+ cd ruby; sccsReport $(OBJECTNAME).rb; \
176+ else \
177+ echo "Source files (ruby) are already editable."; \
178+ fi
179+ @if [ -r perl/$(OBJECTNAME).pl ] ; \
180+ then \
181+ cd perl; sccsReport $(OBJECTNAME).pl ; \
182+ else \
183+ echo "Source files (perl) are already editable."; \
184+ fi
185+ @if [ -r ../Config/OptionControlFile ]; \
186+ then \
187+ cd ../Config; sccsReport OptionControlFile; \
188+ else \
189+ echo "OptionControlFile are already editable."; \
190+ fi
191+
192+clean :
193+ rm -f *.debugo $(OSTYPE)/*.debugo *.cudagdbo $(OSTYPE)/*.cudagdbo *.o $(OSTYPE)/*.o *.linkinfo $(OSTYPE)/*.linkinfo \
194+ $(OSTYPE)/$(OBJECTNAME) $(OSTYPE)/*.$(OSTYPE) \
195+ $(OSTYPE)/$(OBJECTNAME).debug $(OSTYPE)/*.$(OSTYPE).debug \
196+ $(OSTYPE)/$(OBJECTNAME).cudagdb $(OSTYPE)/*.$(OSTYPE).cudagdb \
197+ $(OSTYPE)/$(OBJECTNAME).linkinfo $(OSTYPE)/*.$(OSTYPE).linkinfo \
198+ *.bak *.$(OSTYPE) core
199+
200+install: install-bin install-doc install-wish install-ruby install-shell install-perl
201+ @if [ dummy$(KHOROS_KENGOBJ) != dummy ] ; \
202+ then \
203+ if [ -x $(KHOROS_KGENOBJ) ] ; \
204+ then \
205+ make install-khoros ; \
206+ fi; \
207+ fi
208+
209+install-bin:$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
210+
211+$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME)
212+ @echo ---- Installing to bin
213+ @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME)
214+ @if [ ! -d $(DSTDIR)/$(OSTYPE) ]; \
215+ then \
216+ mkdir $(DSTDIR)/$(OSTYPE); \
217+ fi
218+ @if [ -x $(OSTYPE)/$(OBJECTNAME) ]; \
219+ then \
220+ echo "Compilation is complete"; \
221+ $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
222+ $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \
223+ $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \
224+ else \
225+ echo "Compilation is incomplete. $(OBJECTNAME)"; \
226+ fi
227+ @echo ---- end of bin
228+
229+install-wish:
230+ @if [ -d wish ]; \
231+ then \
232+ echo "---- Tcl/Tk file Install"; \
233+ if [ ! -d $(DSTDIR)/wish/$(OBJECTNAME) ]; \
234+ then \
235+ mkdir $(DSTDIR)/wish/$(OBJECTNAME) ; \
236+ fi ; \
237+ $(CP) -f wish/* $(DSTDIR)/wish/$(OBJECTNAME); \
238+ $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/* ;\
239+ touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
240+ $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\
241+ echo "---- Tcl/Tk file Installed";\
242+ fi
243+
244+install-ruby:
245+ @if [ -d ruby ]; \
246+ then \
247+ echo "---- Ruby/Tk file Install"; \
248+ if [ ! -d $(DSTDIR)/ruby/$(OBJECTNAME) ]; \
249+ then \
250+ mkdir $(DSTDIR)/ruby/$(OBJECTNAME) ; \
251+ fi ; \
252+ $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \
253+ $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \
254+ echo "---- Ruby/Tk file Installed"; \
255+ fi
256+
257+install-perl:
258+ @if [ -d perl ]; \
259+ then \
260+ echo "---- Perl/Tk file Install"; \
261+ if [ ! -d $(DSTDIR)/perl/$(OBJECTNAME) ]; \
262+ then \
263+ mkdir $(DSTDIR)/perl/$(OBJECTNAME) ; \
264+ fi; \
265+ $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \
266+ $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \
267+ echo "---- Perl/Tk file Installed"; \
268+ fi
269+
270+install-shell:
271+ @if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \
272+ then \
273+ mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \
274+ fi
275+ @if [ -d shell ]; \
276+ then \
277+ echo "---- Shell file Install"; \
278+ if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \
279+ then \
280+ mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \
281+ fi ; \
282+ $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \
283+ $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \
284+ echo "---- Shell file Installed"; \
285+ fi
286+
287+install-khoros:
288+ @echo Installing to khoros
289+ @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KGENOBJ) ]; \
290+ then \
291+ echo kgenobj;\
292+ $(KHOROS_KGENOBJ) -tb Eos -oname $(OBJECTNAME) -type script -pane -cantata true -cat Eos -subcat $(CLASSNAME) -description $(OBJECTNAME) -bname $(OBJECTNAME) -form -lang ksh ; \
293+ fi
294+ @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \
295+ then \
296+ $(KHOROS_KSET) -tb Eos -oname $(OBJECTNAME) -icon $(OBJECTNAME) ; \
297+ fi
298+ @if [ -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \
299+ then \
300+ $(CHMOD) -R 775 ../../../../../objects/script/$(OBJECTNAME) ; \
301+ if [ $? ] ; \
302+ then \
303+ echo "-- setting khoros ---" ; \
304+ if [ -d ../../../../../objects/script/$(OBJECTNAME)/uis/ ] ; \
305+ then \
306+ $(CD) ../../../../../objects/script/$(OBJECTNAME)/uis/ ; \
307+ $(RM) -f $(OBJECTNAME).pane ; \
308+ $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \
309+ $(CD) ../../ ; \
310+ $(CHMOD) -R 555 $(OBJECTNAME); \
311+ else \
312+ echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \
313+ fi ; \
314+ else \
315+ echo "Failed !!: Cannot chage mode in installing $(OBJECTNAME) to khoros system"; \
316+ fi ; \
317+ echo "-- end of khoros-installing"; \
318+ fi
319+
320+install-doc: html
321+ @if [ ! -d $(DSTDOC)/SmallTools ]; \
322+ then \
323+ mkdir $(DSTDOC)/SmallTools ;\
324+ fi
325+ @if [ -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ]; \
326+ then \
327+ $(RM) -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ;\
328+ fi
329+ @$(CP) $(OBJECTNAME).html $(DSTDOC)/SmallTools/$(OBJECTNAME).html
330+ @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html
331+ @if [ -f ../doc/*.html ]; \
332+ then \
333+ $(CP) ../doc/*.html $(DSTDOC)/SmallTools/ ;\
334+ fi
335+ @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html
336+ @if [ -f $(DSTDOC)/SmallTools/Makefile ]; \
337+ then \
338+ cd $(DSTDOC)/SmallTools; $(MAKE); \
339+ fi
340+
341+html: $(OBJECTNAME).html
342+
343+configFileRead:
344+ @ctrl2configFileRead $(CLASSNAME) $(OBJECTNAME) ../Config/OptionControlFile
345+
346+$(OBJECTNAME).html: $(OSTYPE)/$(OBJECTNAME)
347+ @echo creating html
348+ @$(OSTYPE)/$(OBJECTNAME) -html 2> $(OBJECTNAME).html.tmp
349+ @sed -e s/$(OSTYPE)\\/// $(OBJECTNAME).html.tmp > $(OBJECTNAME).html
350+ @$(RM) $(OBJECTNAME).html.tmp
351+
352+$(DSTDIR)/$(OBJECTNAME): $(OSTYPE)/$(OBJECTNAME)
353+ @ln -s -f ../sbin/MachineIndependent $@
354+
355+depend::
356+ @echo dependency checking now
357+ @if [ ! -L $(OSTYPE) ] ; then \
358+ moveHostdependent; \
359+ fi
360+ rm -f $(OSTYPE)/.Depend
361+ #echo C
362+ @if [ -f $(OBJECTNAME).c ] ; \
363+ then \
364+ echo "dependency: *.c"; \
365+ echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c ; \
366+ $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c >> $(OSTYPE)/.Depend ; \
367+ fi
368+ #echo CC
369+ @if [ -f $(OBJECTNAME).cc ] ; \
370+ then \
371+ echo "dependency: *.cc"; \
372+ echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc ; \
373+ $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc >> $(OSTYPE)/.Depend ; \
374+ fi
375+ @if [ -f $(OBJECTNAME).ccm ] ; \
376+ then \
377+ echo "dependency: *.ccm"; \
378+ echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm ; \
379+ $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm >> $(OSTYPE)/.Depend ; \
380+ fi
381+ @if [ -f $(OBJECTNAME).cu ] ; \
382+ then \
383+ echo "dependency: *.cu"; \
384+ echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu ; \
385+ $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu >> $(OSTYPE)/.Depend ; \
386+ fi
387+
388+update:../Config/OptionControlFile
389+ maketool $(CLASSNAME) $(OBJECTNAME) update
390+
391+changeName::
392+
393+Test:$(OSTYPE)/$(OBJECTNAME) TestDir
394+ @if [ -f test/Makefile ] ; \
395+ then \
396+ cd test; make ; \
397+ else \
398+ echo "No test Makefile"; \
399+ fi
400+
401+TestDir::
402+ @if [ ! -d test ] ; \
403+ then \
404+ echo "Creating test dir"; \
405+ mkdir test; \
406+ fi
407+ @if [ ! -f test/Makefile ] ; \
408+ then \
409+ echo "Creating Makefile"; \
410+ cd test; \
411+ protoTestMakefileCreate; \
412+ fi
413+ @if [ ! -d test/data ]; \
414+ then \
415+ mkdir $(EOSHOME)/data/$(OBJECTNAME); \
416+ cd test; \
417+ ln -sf ../$(EOSHOME)/data/$(OBJECTNAME) data; \
418+ fi
419+
420+tar::
421+ cd $(DSTTAR); tar cvf Tools.$(CLASSNAME).$(OBJECTNAME).tar ../bin/$(OBJECTNAME) \
422+ ../bin/*/$(OBJECTNAME).* \
423+ ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \
424+ ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar
425+
426+-include $(OSTYPE)/.Depend
427+-include ../Config/Target.inc
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64
@@ -0,0 +1 @@
1+../../../../../hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64
\ No newline at end of file
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/argCheck.c
@@ -0,0 +1,107 @@
1+#include <stdio.h>
2+#include <stdlib.h>
3+#include <string.h>
4+#include <math.h>
5+#include "../inc/config.h"
6+#include "genUtil.h"
7+#include "String.h"
8+#include "File.h"
9+#include "Memory.h"
10+
11+
12+void
13+argCheck(mrcImageDividedByFileInfo* info, int argc, char* argv[])
14+{
15+ long i;
16+ char s[1024];
17+ FILE* fpt;
18+
19+ if(NULL==(fpt=fopen(".EosLog", "a+"))) {
20+
21+ } else {
22+ for(i=0; i<argc; i++) {
23+ fprintf(fpt, "%s ", argv[i]);
24+ }
25+ fprintf(fpt, "\n");
26+ fclose(fpt);
27+ }
28+ for(i=1; i<argc; i++) {
29+ if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
30+ SSWITCH(argv[i]+OPTION_POS)
31+ SCASE("i1") {
32+ if(i+1<argc) {
33+ info->In1 = stringGetNthWord(argv[i+1], 1, " ,");
34+ i++;
35+ info->flagIn1++;
36+ } else {
37+ usage(argv[0]);
38+ exit(EXIT_FAILURE);
39+ }
40+ SBREAK;
41+ }
42+ SCASE("i2") {
43+ if(i+1<argc) {
44+ info->In2 = stringGetNthWord(argv[i+1], 1, " ,");
45+ i++;
46+ info->flagIn2++;
47+ } else {
48+ usage(argv[0]);
49+ exit(EXIT_FAILURE);
50+ }
51+ SBREAK;
52+ }
53+ SCASE("o") {
54+ if(i+1<argc) {
55+ info->Out = stringGetNthWord(argv[i+1], 1, " ,");
56+ i++;
57+ info->flagOut++;
58+ } else {
59+ usage(argv[0]);
60+ exit(EXIT_FAILURE);
61+ }
62+ SBREAK;
63+ }
64+ SCASE("c") {
65+ if(i+1<argc) {
66+ info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
67+ i++;
68+ info->flagconfigFile++;
69+ } else {
70+ usage(argv[0]);
71+ exit(EXIT_FAILURE);
72+ }
73+ SBREAK;
74+ }
75+ SCASE("m") {
76+ if(i+1<argc) {
77+ info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
78+ i++;
79+ info->flagmode++;
80+ } else {
81+ usage(argv[0]);
82+ exit(EXIT_FAILURE);
83+ }
84+ SBREAK;
85+ }
86+ SCASE("h") {
87+ usage(argv[0]);
88+ exit(EXIT_SUCCESS);
89+ break;
90+ }
91+ SCASE("html") {
92+ htmlBeforeUsage(argv[0]);
93+ usage(argv[0]);
94+ htmlAfterUsage(argv[0]);
95+ exit(EXIT_SUCCESS);
96+ break;
97+ }
98+ SDEFAULT {
99+ fprintf(stderr, "Not Supported Options: :%s\n", argv[i]);
100+ usage(argv[0]);
101+ exit(EXIT_FAILURE);
102+ break;
103+ }
104+ SSWITCHEND;
105+ }
106+ }
107+}
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/init.c
@@ -0,0 +1,101 @@
1+#include <stdio.h>
2+#include <stdlib.h>
3+#include <string.h>
4+#include <math.h>
5+#include "../inc/config.h"
6+#include "genUtil.h"
7+#include "String.h"
8+#include "File.h"
9+#include "Memory.h"
10+
11+
12+void
13+init0(mrcImageDividedByFileInfo* info)
14+{
15+ info->fptIn1 = NULL; info->flagIn1 = 0;
16+ info->fptIn2 = NULL; info->flagIn2 = 0;
17+ info->fptOut = NULL; info->flagOut = 0;
18+ info->fptconfigFile = NULL; info->flagconfigFile = 0;
19+ info->mode = 0; info->flagmode = 0;
20+}
21+
22+void
23+init1(mrcImageDividedByFileInfo* info)
24+{
25+ char s[1024];
26+ int i;
27+ if(!info->flagIn1) {
28+ stringGetFromFile(s, "In1", stdin, stdout, 0);
29+ info->In1 = stringGetNthWord(s, 1, " ,\t");
30+ info->flagIn1++;
31+ }
32+ if(info->flagIn1) {
33+ info->fptIn1 = fileOpen(info->In1, "r");
34+ }
35+
36+ if(!info->flagIn2) {
37+ stringGetFromFile(s, "In2", stdin, stdout, 0);
38+ info->In2 = stringGetNthWord(s, 1, " ,\t");
39+ info->flagIn2++;
40+ }
41+ if(info->flagIn2) {
42+ info->fptIn2 = fileOpen(info->In2, "r");
43+ }
44+
45+ if(!info->flagOut) {
46+ stringGetFromFile(s, "Out", stdin, stdout, 0);
47+ info->Out = stringGetNthWord(s, 1, " ,\t");
48+ info->flagOut++;
49+ }
50+ if(info->flagOut) {
51+ info->fptOut = fileOpen(info->Out, "w");
52+ }
53+
54+ if(info->flagconfigFile) {
55+ info->fptconfigFile = fileOpen(info->configFile, "r");
56+ }
57+
58+ if(info->flagmode) {
59+ }
60+
61+}
62+#ifdef KHOROS
63+#include <stdio.h>
64+#include "bootstrap.h"
65+#include "dataserv.h"
66+#include "datamanip.h"
67+extern void func_usage_additions(void);
68+extern void func_free_args(kexit_status status, kaddr client_data);
69+extern void func_get_args(kform* pane);
70+
71+void
72+func_usage_additions(void)
73+{
74+}
75+void
76+func_free_args(kexit_status status, kaddr client_data)
77+{
78+}
79+void
80+func_get_args(kform* pane)
81+{
82+}
83+void
84+khorosInit(int argc, char* argv[])
85+{
86+ char* eospath;
87+ char panepath[1024];
88+ FILE* fpt;
89+
90+ eospath = getenv("EOS_HOME");
91+ sprintf(panepath, "%s/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.pane", eospath);
92+ khoros_initialize(argc, argv, "EOS");
93+ fpt = fopen(panepath, "r"); if(NULL!=fpt) {
94+ fclose(fpt);
95+ kclui_initialize(panepath, KGEN_NONE, "EOS", "mrcImageDividedByFile",
96+ func_usage_additions,
97+ func_get_args,
98+ func_free_args);
99+ }
100+}
101+#endif /* KHOROS */
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.c
@@ -0,0 +1,61 @@
1+/*
2+# mrcImageDividedByFile : $Revision$
3+# $Date$
4+# Created by $Author$
5+# Usage : mrcImageDividedByFile
6+# Attention
7+# $Loccker$
8+# $State$
9+#
10+*/
11+#include <stdio.h>
12+#include <stdlib.h>
13+#include <string.h>
14+#include <math.h>
15+#define GLOBAL_DECLARATION
16+#include "../inc/config.h"
17+
18+#define DEBUG
19+#include "genUtil.h"
20+#include "mrcImage.h"
21+
22+/*
23+Example:
24+typedef struct lmrcImageDividedByFileInfo {
25+ float a;
26+ int b;
27+} lmrcImageDividedByFileInfo;
28+
29+typedef enum lmrcImageDividedByFileMode {
30+ a=0,
31+ b=1
32+} lmrcImageDividedByFileMode;
33+*/
34+
35+int
36+main(int argc, char* argv[])
37+{
38+ mrcImageDividedByFileInfo info;
39+ mrcImage in1;
40+ mrcImage in2;
41+ mrcImage out;
42+
43+ init0(&info);
44+ argCheck(&info, argc, argv);
45+ init1(&info);
46+
47+ DEBUGPRINT("Program Start\n");
48+ mrcFileRead(&in1, info.In1, "in main", 0);
49+ mrcFileRead(&in2, info.In2, "in main", 0);
50+
51+ lmrcImageDividedByImage(&out, &in1, &in2);
52+
53+ mrcFileWrite(&out, info.Out, "in main", 0);
54+ exit(EXIT_SUCCESS);
55+}
56+
57+void
58+additionalUsage()
59+{
60+ fprintf(stderr, "----- Additional Usage -----\n");
61+}
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.html
@@ -0,0 +1,19 @@
1+<HTML>
2+<HEAD>
3+<TITLE>mrcImageDividedByFile</TITLE>
4+</HEAD>
5+<BODY>
6+<H1>mrcImageDividedByFile</H1>
7+<H2>Usage</H2>
8+<PRE>
9+Usage: mrcImageDividedByFile
10+Options:
11+ [-i[nput]1 In1 (NULL ).as(inFile::mrcImage ) ] :Essential :Input: In1
12+ [-i[nput]2 In2 (NULL ).as(inFile::mrcImage ) ] :Essential :Input: In2
13+ [-o[utput] Out (NULL ).as(outFile::mrcImage ) ] :Essential :Output: In1/In2
14+ [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile
15+ [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode
16+----- Additional Usage -----
17+</PRE>
18+</BODY>
19+</HTML>
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.pane
@@ -0,0 +1,17 @@
1+-F 4.3 1 0 52x1+0+0 +0+0 'Cantata' cantata
2+ -M 1 1 52x1+0+0 +1+0 ' ' subform
3+ -P 1 0 52x1+0+1 +0+0 ' ' mrcImageDividedByFile
4+ -D 1 0 9x1+0+0 'Options' _gui_options
5+ -H 1 6x1+0+0 'License' 'license' $BOOTSTRAP/repos/license/License license
6+ -E
7+ -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrcImageDividedByFile
8+ -H 1 5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageDividedByFile/doc/mrcImageDividedByFile.doc help
9+ -Q 1 0 5.25x1+47+0 'Close'
10+ -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In1' 'Input: In1' i1
11+ -I 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'In2' 'Input: In2' i2
12+ -O 1 0 1 1 0 1 -1x1+1+4.500000 ' ' 'Out' 'Output: In1/In2' o
13+ -I 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'configFile' 'ConfigurationFile' c
14+ -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m
15+ -E
16+ -E
17+-E
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/test/Makefile
@@ -0,0 +1,17 @@
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) -i1 data/121p-move.mrc -i2 data/121p-move.mrc -o data/test.out
15+ @echo "----- Calc check -----"
16+
17+clean:
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/test/data
@@ -0,0 +1 @@
1+../../../../../..//data/mrcImageDividedByFile
\ No newline at end of file
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/usage.c
@@ -0,0 +1,37 @@
1+#include <stdio.h>
2+#include <stdlib.h>
3+#include "../inc/config.h"
4+
5+void
6+usage(char* thisProgram)
7+{
8+ fprintf(stderr, "Usage: %s\n", thisProgram);
9+ fprintf(stderr, "Options:\n");
10+ fprintf(stderr, " [-i[nput]1 In1 (NULL ).as(inFile::mrcImage ) ] :Essential :Input: In1\n");
11+ fprintf(stderr, " [-i[nput]2 In2 (NULL ).as(inFile::mrcImage ) ] :Essential :Input: In2\n");
12+ fprintf(stderr, " [-o[utput] Out (NULL ).as(outFile::mrcImage ) ] :Essential :Output: In1/In2\n");
13+ fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n");
14+ fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n");
15+ additionalUsage();
16+}
17+
18+void
19+htmlBeforeUsage(char* thisProgram)
20+{
21+ fprintf(stderr, "<HTML>\n");
22+ fprintf(stderr, "<HEAD>\n");
23+ fprintf(stderr, "<TITLE>%s</TITLE>\n", thisProgram);
24+ fprintf(stderr, "</HEAD>\n");
25+ fprintf(stderr, "<BODY>\n");
26+ fprintf(stderr, "<H1>%s</H1>\n", thisProgram);
27+ fprintf(stderr, "<H2>Usage</H2>\n");
28+ fprintf(stderr, "<PRE>\n");
29+}
30+
31+void
32+htmlAfterUsage(char* thisProgram)
33+{
34+ fprintf(stderr, "</PRE>\n");
35+ fprintf(stderr, "</BODY>\n");
36+ fprintf(stderr, "</HTML>\n");
37+}
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/util.c
@@ -0,0 +1,4 @@
1+#include <stdio.h>
2+#include <stdlib.h>
3+#include "../inc/config.h"
4+
Show on old repository browser