From: Takuo Yasunaga Date: Sat, 21 Jun 2014 09:18:51 +0000 (+0900) Subject: Create a new command: X-Git-Tag: v2.1.0p0020~27^2~3 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=c96675f51bdf24764ea3f22eda4872525ec5e14f;p=eos%2Fbase.git 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/* --- diff --git a/bin/mrcImageDividedByFile b/bin/mrcImageDividedByFile new file mode 120000 index 0000000000..eddb95508d --- /dev/null +++ b/bin/mrcImageDividedByFile @@ -0,0 +1 @@ +../sbin/MachineIndependent \ No newline at end of file diff --git a/hostdepend/X86MAC64/bin/X86MAC64/mrcImageDividedByFile b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageDividedByFile new file mode 100755 index 0000000000..518149cfe0 Binary files /dev/null and b/hostdepend/X86MAC64/bin/X86MAC64/mrcImageDividedByFile differ diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a index 259834e7f7..885cf64e35 100644 Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a and b/hostdepend/X86MAC64/lib/X86MAC64/libEosObjects.a differ diff --git a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a index 640f4a3ce4..01fe72cbb0 100644 Binary files a/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a and b/hostdepend/X86MAC64/lib/X86MAC64/libmrcImage.a differ diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo index 390d824adf..829e22a760 100644 Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/lmrcImageAverage.sharedo differ diff --git a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo index 5f2532a86f..51237cd580 100644 Binary files a/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo and b/hostdepend/X86MAC64/lib/X86MAC64/shared/mrcImageOperation.sharedo differ diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.a index 640f4a3ce4..01fe72cbb0 100644 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 diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/libmrcImage.debug.a index 3bf76be22d..c5dd3f1a31 100644 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 diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAverage.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/lmrcImageAverage.sharedo index 390d824adf..829e22a760 100644 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 diff --git a/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo b/hostdepend/X86MAC64/src/Objects/DataManip/mrcImage/src/X86MAC64/mrcImageOperation.sharedo index 5f2532a86f..51237cd580 100644 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 diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/.Depend b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/.Depend new file mode 100644 index 0000000000..afc8858afe --- /dev/null +++ b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/.Depend @@ -0,0 +1,199 @@ +argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ + /usr/include/sys/_symbol_aliasing.h \ + /usr/include/sys/_posix_availability.h /usr/include/Availability.h \ + /usr/include/AvailabilityInternal.h /usr/include/_types.h \ + /usr/include/sys/_types.h /usr/include/machine/_types.h \ + /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \ + /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \ + /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \ + /usr/include/secure/_stdio.h /usr/include/secure/_common.h \ + /usr/include/stdlib.h /usr/include/sys/wait.h \ + /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \ + /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \ + /usr/include/machine/signal.h /usr/include/i386/signal.h \ + /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \ + /usr/include/mach/i386/_structs.h \ + /usr/include/sys/_types/_sigaltstack.h \ + /usr/include/sys/_types/_ucontext.h \ + /usr/include/sys/_types/_pthread_attr_t.h \ + /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ + /usr/include/sys/resource.h \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ + /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ + /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ + /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ + /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \ + /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \ + /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \ + /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \ + /usr/include/machine/endian.h /usr/include/i386/endian.h \ + /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \ + /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \ + /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \ + /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \ + /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \ + /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \ + /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \ + ../inc/../inc/mrcImageDividedByFile.h \ + /Users/tacyas/Eos/include/genUtil.h /Users/tacyas/Eos/include/File.h \ + /Users/tacyas/Eos/include/Memory.h \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \ + /usr/include/limits.h /usr/include/machine/limits.h \ + /usr/include/i386/limits.h /usr/include/i386/_limits.h \ + /usr/include/sys/syslimits.h +init.o: init.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ + /usr/include/sys/_symbol_aliasing.h \ + /usr/include/sys/_posix_availability.h /usr/include/Availability.h \ + /usr/include/AvailabilityInternal.h /usr/include/_types.h \ + /usr/include/sys/_types.h /usr/include/machine/_types.h \ + /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \ + /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \ + /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \ + /usr/include/secure/_stdio.h /usr/include/secure/_common.h \ + /usr/include/stdlib.h /usr/include/sys/wait.h \ + /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \ + /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \ + /usr/include/machine/signal.h /usr/include/i386/signal.h \ + /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \ + /usr/include/mach/i386/_structs.h \ + /usr/include/sys/_types/_sigaltstack.h \ + /usr/include/sys/_types/_ucontext.h \ + /usr/include/sys/_types/_pthread_attr_t.h \ + /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ + /usr/include/sys/resource.h \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ + /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ + /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ + /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ + /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \ + /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \ + /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \ + /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \ + /usr/include/machine/endian.h /usr/include/i386/endian.h \ + /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \ + /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \ + /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \ + /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \ + /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \ + /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \ + /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \ + ../inc/../inc/mrcImageDividedByFile.h \ + /Users/tacyas/Eos/include/genUtil.h /Users/tacyas/Eos/include/File.h \ + /Users/tacyas/Eos/include/Memory.h \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/limits.h \ + /usr/include/limits.h /usr/include/machine/limits.h \ + /usr/include/i386/limits.h /usr/include/i386/_limits.h \ + /usr/include/sys/syslimits.h +mrcImageDividedByFile.o: mrcImageDividedByFile.c /usr/include/stdio.h \ + /usr/include/sys/cdefs.h /usr/include/sys/_symbol_aliasing.h \ + /usr/include/sys/_posix_availability.h /usr/include/Availability.h \ + /usr/include/AvailabilityInternal.h /usr/include/_types.h \ + /usr/include/sys/_types.h /usr/include/machine/_types.h \ + /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \ + /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \ + /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \ + /usr/include/secure/_stdio.h /usr/include/secure/_common.h \ + /usr/include/stdlib.h /usr/include/sys/wait.h \ + /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \ + /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \ + /usr/include/machine/signal.h /usr/include/i386/signal.h \ + /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \ + /usr/include/mach/i386/_structs.h \ + /usr/include/sys/_types/_sigaltstack.h \ + /usr/include/sys/_types/_ucontext.h \ + /usr/include/sys/_types/_pthread_attr_t.h \ + /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ + /usr/include/sys/resource.h \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ + /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ + /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ + /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ + /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \ + /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \ + /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \ + /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \ + /usr/include/machine/endian.h /usr/include/i386/endian.h \ + /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \ + /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \ + /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \ + /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \ + /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \ + /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \ + /Users/tacyas/Eos/include/string.h /usr/include/math.h ../inc/config.h \ + ../inc/../inc/mrcImageDividedByFile.h \ + /Users/tacyas/Eos/include/genUtil.h \ + /Users/tacyas/Eos/include/mrcImage.h \ + /Users/tacyas/Eos/include/ctfInfo.h /Users/tacyas/Eos/include/Vector.h \ + /Users/tacyas/Eos/include/Matrix3D.h /Users/tacyas/Eos/include/Array.h +usage.o: usage.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ + /usr/include/sys/_symbol_aliasing.h \ + /usr/include/sys/_posix_availability.h /usr/include/Availability.h \ + /usr/include/AvailabilityInternal.h /usr/include/_types.h \ + /usr/include/sys/_types.h /usr/include/machine/_types.h \ + /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \ + /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \ + /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \ + /usr/include/secure/_stdio.h /usr/include/secure/_common.h \ + /usr/include/stdlib.h /usr/include/sys/wait.h \ + /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \ + /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \ + /usr/include/machine/signal.h /usr/include/i386/signal.h \ + /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \ + /usr/include/mach/i386/_structs.h \ + /usr/include/sys/_types/_sigaltstack.h \ + /usr/include/sys/_types/_ucontext.h \ + /usr/include/sys/_types/_pthread_attr_t.h \ + /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ + /usr/include/sys/resource.h \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ + /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ + /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ + /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ + /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \ + /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \ + /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \ + /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \ + /usr/include/machine/endian.h /usr/include/i386/endian.h \ + /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \ + /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \ + /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \ + /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \ + /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \ + /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \ + ../inc/config.h ../inc/../inc/mrcImageDividedByFile.h +util.o: util.c /usr/include/stdio.h /usr/include/sys/cdefs.h \ + /usr/include/sys/_symbol_aliasing.h \ + /usr/include/sys/_posix_availability.h /usr/include/Availability.h \ + /usr/include/AvailabilityInternal.h /usr/include/_types.h \ + /usr/include/sys/_types.h /usr/include/machine/_types.h \ + /usr/include/i386/_types.h /usr/include/sys/_types/_va_list.h \ + /usr/include/sys/_types/_size_t.h /usr/include/sys/_types/_null.h \ + /usr/include/sys/_types/_off_t.h /usr/include/sys/_types/_ssize_t.h \ + /usr/include/secure/_stdio.h /usr/include/secure/_common.h \ + /usr/include/stdlib.h /usr/include/sys/wait.h \ + /usr/include/sys/_types/_pid_t.h /usr/include/sys/_types/_id_t.h \ + /usr/include/sys/signal.h /usr/include/sys/appleapiopts.h \ + /usr/include/machine/signal.h /usr/include/i386/signal.h \ + /usr/include/machine/_mcontext.h /usr/include/i386/_mcontext.h \ + /usr/include/mach/i386/_structs.h \ + /usr/include/sys/_types/_sigaltstack.h \ + /usr/include/sys/_types/_ucontext.h \ + /usr/include/sys/_types/_pthread_attr_t.h \ + /usr/include/sys/_types/_sigset_t.h /usr/include/sys/_types/_uid_t.h \ + /usr/include/sys/resource.h \ + /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdint.h \ + /usr/include/stdint.h /usr/include/sys/_types/_int8_t.h \ + /usr/include/sys/_types/_int16_t.h /usr/include/sys/_types/_int32_t.h \ + /usr/include/sys/_types/_int64_t.h /usr/include/_types/_uint8_t.h \ + /usr/include/_types/_uint16_t.h /usr/include/_types/_uint32_t.h \ + /usr/include/_types/_uint64_t.h /usr/include/sys/_types/_intptr_t.h \ + /usr/include/sys/_types/_uintptr_t.h /usr/include/_types/_intmax_t.h \ + /usr/include/_types/_uintmax_t.h /usr/include/sys/_types/_timeval.h \ + /usr/include/machine/endian.h /usr/include/i386/endian.h \ + /usr/include/sys/_endian.h /usr/include/libkern/_OSByteOrder.h \ + /usr/include/libkern/i386/_OSByteOrder.h /usr/include/alloca.h \ + /usr/include/sys/_types/_ct_rune_t.h /usr/include/sys/_types/_rune_t.h \ + /usr/include/sys/_types/_wchar_t.h /usr/include/machine/types.h \ + /usr/include/i386/types.h /usr/include/sys/_types/___offsetof.h \ + /usr/include/sys/_types/_dev_t.h /usr/include/sys/_types/_mode_t.h \ + ../inc/config.h ../inc/../inc/mrcImageDividedByFile.h diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/Makefile b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/Makefile new file mode 100755 index 0000000000..ec6124702f --- /dev/null +++ b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/Makefile @@ -0,0 +1,114 @@ +include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Define.inc +include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/Config/Define.inc +include $(EOS_HOME)/src/$(WORLDNAME)/Config/Define.inc +include $(EOS_HOME)/src/Config/DefineTool.inc + +LIBFILES = \ + $(LIBPREFIX)EosObjects$(LIBSUFFIX) + +LIBFILESDEBUG = \ + $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX) + +SRCC = \ + $(OBJECTNAME).c \ + init.c \ + argCheck.c \ + usage.c \ + util.c + +SRCCXX = \ + $(OBJECTNAME).cc \ + init.cc \ + argCheck.cc \ + usage.cc \ + util.cc + +MODULES = \ + $(OBJECTNAME).o \ + init.o \ + argCheck.o \ + usage.o \ + util.o + +REALMODULES = \ + $(OSTYPE)/$(OBJECTNAME).o \ + $(OSTYPE)/init.o \ + $(OSTYPE)/argCheck.o \ + $(OSTYPE)/usage.o \ + $(OSTYPE)/util.o + +MODULESDEBUG = \ + $(OBJECTNAME).debugo \ + init.debugo \ + argCheck.debugo \ + usage.debugo \ + util.debugo + +MODULESCUDAGDB = \ + $(OBJECTNAME).cudagdb.o \ + init.cudagdb.o \ + argCheck.cudagdb.o \ + usage.cudagdb.o \ + util.cudagdb.o + +REALMODULESDEBUG = \ + $(OSTYPE)/$(OBJECTNAME).debugo \ + $(OSTYPE)/init.debugo \ + $(OSTYPE)/argCheck.debugo \ + $(OSTYPE)/usage.debugo \ + $(OSTYPE)/util.debugo + + +$(OBJECTNAME): $(MODULES) $(LIBFILES) + @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \ + then \ + echo $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + $(CC) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + fi + @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \ + then \ + echo $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + $(CXX) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + fi + @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \ + then \ + echo "MICO"; \ + echo $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + $(MICOLD) $(CCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + fi + @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \ + then \ + echo $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ; \ + $(NVCC) $(NVCCOPTS) $(MODULES) $(LIBFILES) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) $(CUDALIB) $(CUDAINC) -o $@ ; \ + fi + + +$(OBJECTNAME).debug: $(MODULESDEBUG) $(LIBFILESDEBUG) + @if [ -f $(VPATH)/$(OBJECTNAME).c ] ; \ + then \ + echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + fi + @if [ -f $(VPATH)/$(OBJECTNAME).cc ] ; \ + then \ + echo $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + $(CXX) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + fi + @if [ -f $(VPATH)/$(OBJECTNAME).ccm ] ; \ + then \ + echo "MICO"; \ + echo $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + $(MICOLD) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + fi + @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \ + then \ + echo $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + $(CC) $(CCOPTSDEBUG) $(MODULESDEBUG) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ ; \ + fi + +$(OBJECTNAME).cudagdb: $(MODULESCUDAGDB) $(LIBFILESDEBUG) + echo $(NVCC) "$(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@" + $(NVCC) $(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@ + +include ./.Depend +include $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Target.inc diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/X86MAC64 b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/X86MAC64 new file mode 120000 index 0000000000..8269935d9b --- /dev/null +++ b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/X86MAC64 @@ -0,0 +1 @@ +../../../../../hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64 \ No newline at end of file diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/mrcImageDividedByFile b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/mrcImageDividedByFile new file mode 100755 index 0000000000..518149cfe0 Binary files /dev/null and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64/mrcImageDividedByFile differ diff --git a/include/mrcImage.h b/include/mrcImage.h index 772453c845..773d165040 100644 --- a/include/mrcImage.h +++ b/include/mrcImage.h @@ -716,11 +716,11 @@ extern int IsFFT(mrcImage* mrc, char* message, mrcImageParaTypeInteger mode); extern void mrcImageInfoSet(mrcImage* mrc, FILE* fptIn, FILE* fptOut, long mode); /* in mrcImageOperation.c */ -extern void lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2); +extern void lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2); extern void lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se); extern void lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig); -extern void lmrcImageDevidedByReal(mrcImage* img, double d); -extern void lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d); +extern void lmrcImageDividedByReal(mrcImage* img, double d); +extern void lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d); extern void lmrcImageAddedByReal(mrcImage* img, double d); extern void lmrcImageStdDev(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num); extern void lmrcImageStdErr(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num); diff --git a/src/Objects/DataManip/mrcImage/doc/mrcImage.html b/src/Objects/DataManip/mrcImage/doc/mrcImage.html index 83611cb2ab..a9090b6dd1 100755 --- a/src/Objects/DataManip/mrcImage/doc/mrcImage.html +++ b/src/Objects/DataManip/mrcImage/doc/mrcImage.html @@ -103,305 +103,6 @@

Information from source codes

-../src/fftn.c:
-
-../src/lmrcFETnormalizeBySD.c:
-
-../src/lmrcFFTExpression.c:
-
-../src/lmrcFFTFGconj.c:
-
-../src/lmrcFFTFxG.c:
-
-../src/lmrcFFTInfo.c:
-
-../src/lmrcImage3DWindowing.c:
-
-../src/lmrcImageAddValue.c:
-
-../src/lmrcImageAsProbability.c:
-
-../src/lmrcImageAverage.c:
-
-../src/lmrcImageBandPassFilter.c:
-
-../src/lmrcImageBilateralFilter.c:
-
-../src/lmrcImageBinarization.c:
-
-../src/lmrcImageBoundaryInfo.c:
-
-../src/lmrcImageCalcArea.c:
-
-../src/lmrcImageCenterGet.c:
-
-../src/lmrcImageCentre.c:
-
-../src/lmrcImageClosing.c:
-
-../src/lmrcImageClusterAnalysis.c:
-
-../src/lmrcImageCommonLine.c:
-
-../src/lmrcImageConnection.c:
-
-../src/lmrcImageConnectivityNumberCalc.c:
-
-../src/lmrcImageContourSurface.c:
-
-../src/lmrcImageContraction.c:
-
-../src/lmrcImageCorrelation.c:
-     $lmrcImageEuclidDistanceCalc:  Calculate Euclid distance between two images $
-     $arg: in1:  input mrcImage1 $
-     $arg: in2:  input mrcImage2 $
-     $arg: mode: input int $
-     $mode: 0 Sum of SQR $
-     $mode: 1 Distance $
-     $return: EuclidDistance $
-
-../src/lmrcImageCorrelationinSpace.c:
-
-../src/lmrcImageCorrelationPVM.c:
-
-../src/lmrcImageCorrelationWithCTFCompensation.c:
-
-../src/lmrcImageCrystalCreate.c:
-
-../src/lmrcImageCTFCompensation.c:
-
-../src/lmrcImageCTFDetermination.c:
-
-../src/lmrcImageCTFObservation.c:
-
-../src/lmrcImageCTFSN.c:
-
-../src/lmrcImageCVE.c:
-
-../src/lmrcImageDataMaxAndMinGetByImage.c:
-
-../src/lmrcImageDataStraightCopy.c:
-
-../src/lmrcImageDensity.c:
-
-../src/lmrcImageDensityInverse.c:
-
-../src/lmrcImageDensityNormalizationByImage.c:
-
-../src/lmrcImageDilation.c:
-
-../src/lmrcImageDistanceConversion.c:
-
-../src/lmrcImageEdgeAverage.c:
-
-../src/lmrcImageEdge.c:
-
-../src/lmrcImageErosion.c:
-
-../src/lmrcImageFeatureExtraction.c:
-
-../src/lmrcImageFeatureExtractionCoOccurrence.c:
-
-../src/lmrcImageFeatureExtractionRunLength.c:
-
-../src/lmrcImageFFT.c:
-
-../src/lmrcImageFilterCreate.c:
-
-../src/lmrcImageFirstNoiseReductionByRelaxation.c:
-
-../src/lmrcImageFOMCalc.c:
-
-../src/lmrcImageFourierPowerSpectrum.c:
-
-../src/lmrcImageFourierShellCorrelation.c:
-
-../src/lmrcImageHighlighting.c:
-
-../src/lmrcImageHighPassFilter.c:
-
-../src/lmrcImageLabeling.c:
-
-../src/lmrcImageLowPassFilter.c:
-
-../src/lmrcImageMasking.c:
-
-../src/lmrcImageMaxDataGet.c:
-
-../src/lmrcImageMirroring.c:
-     $lmrcImageMirroring: (mrcImage* out, mrcImage* in, lmrcImageMirroring mode) $
-
-../src/lmrcImageModeChange.c:
-
-../src/lmrcImageModelCreate.c:
-
-../src/lmrcImageMontageCreate.c:
-
-../src/lmrcImageMorphology.c:
-
-../src/lmrcImageMove.c:
-
-../src/lmrcImageMultiCTFCompensation.c:
-
-../src/lmrcImageMultiplying.c:
-
-../src/lmrcImageNormalizing.c:
-
-../src/lmrcImageOneLineSimilarityCalc.c:
-
-../src/lmrcImageOpening.c:
-
-../src/lmrcImagePad.c:
-
-../src/lmrcImagePartImageSegmentation.c:
-
-../src/lmrcImagePixelSummationOfProbabilityGetByImage.c:
-
-../src/lmrcImagePosterization.c:
-
-../src/lmrcImageProjection.c:
-
-../src/lmrcImageProportionalDensityLevelSetByImage.c:
-
-../src/lmrcImageRadialDistribution.c:
-
-../src/lmrcImageRhoFiltering.c:
-
-../src/lmrcImageROI2D.c:
-
-../src/lmrcImageROI3D.c:
-
-../src/lmrcImageROInotChangeHeaderLength.c:
-
-../src/lmrcImageRotation.c:
-
-../src/lmrcImageSamplingUnitChange.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxation.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijDimensionSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueCalculate.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationDijValueSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationQValueSet.c:
-
-../src/lmrcImageSecondNoiseReductionByRelaxationRValueSet.c:
-
-../src/lmrcImagesFTest.c:
-
-../src/lmrcImageShapePCA.c:
-
-../src/lmrcImageShift.c:
-
-../src/lmrcImageShrink.c:
-
-../src/lmrcImageSigmaCalculate.c:
-
-../src/lmrcImageSinogram.c:
-
-../src/lmrcImageSinogramCorrelation.c:
-
-../src/lmrcImageSinogramFFT.c:
-
-../src/lmrcImageSmoothing.c:
-
-../src/lmrcImageSolventFlattening.c:
-
-../src/lmrcImageSphere.c:
-
-../src/lmrcImageSplit.c:
-
-../src/lmrcImageSSDA.c:
-
-../src/lmrcImagesStatDataGet.c:
-
-../src/lmrcImagesTTest.c:
-
-../src/lmrcImageStudentCalculate.c:
-
-../src/lmrcImageSubtractionCalc.c:
-
-../src/lmrcImageSummationCalculate.c:
-
-../src/lmrcImagesVarianceAnalysis.c:
-
-../src/lmrcImagesVarianceMap.c:
-
-../src/lmrcImageSymmetryFind.c:
-
-../src/lmrcImageTfunction.c:
-
-../src/lmrcImageTrans.c:
-
-../src/lmrcImageTransformDescartesIntoPolar.c:
-
-../src/lmrcImageTriming.c:
-
-../src/lmrcImageVolumeCalc.c:
-
-../src/lmrcImageWindowing.c:
-
-../src/lmrcSinogramFET.c:
-
-../src/lmrcSinogramFETcalcWeight.c:
-
-../src/lmrcSinogramFETcorrelationMap.c:
-
-../src/lmrcSinogramFETnormalizedMap.c:
-
-../src/lmrcSinogramFETPCA.c:
-
-../src/lmrcSinogramFETreferredCorrelation.c:
-
-../src/lmrcSinogramFETsmoothParameterMatching.c:
-
-../src/mrcImageCheckFFT.c:
-
-../src/mrcImageCheckSameSize.c:
-
-../src/mrcImageCopy.c:
-
-../src/mrcImageDataSet.c:
-
-../src/mrcImageError.c:
-
-../src/mrcImagefuncmin.c:
-
-../src/mrcImageGet.c:
-
-../src/mrcImageInfo.c:
-
-../src/mrcImageInit.c:
-
-../src/mrcImageOperation.c:
-
-../src/mrcImagePrint.c:
-
-../src/mrcImagePVM.c:
-
-../src/mrcImageRead.c:
-
-../src/mrcImageSectionGet.c:
-
-../src/mrcImageSectionSet.c:
-
-../src/mrcImageSet.c:
-
-../src/mrcImageTailer.c:
-
-../src/mrcImageToIntImage.c:
-
-../src/mrcImageUtil.c:
-
-../src/mrcImageUtilityforVariance.c:
-
-../src/mrcImageWrite2.c:
-
-../src/mrcImageWrite.c:
-
-../src/mrcRefUtil.c:
@@ -1126,11 +827,11 @@ extern int IsFFT(mrcImage* mrc, char* message, mrcImageParaTypeInteger mode); extern void mrcImageInfoSet(mrcImage* mrc, FILE* fptIn, FILE* fptOut, long mode); /* in mrcImageOperation.c */ -extern void lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2); +extern void lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2); extern void lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se); extern void lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig); -extern void lmrcImageDevidedByReal(mrcImage* img, double d); -extern void lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d); +extern void lmrcImageDividedByReal(mrcImage* img, double d); +extern void lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d); extern void lmrcImageAddedByReal(mrcImage* img, double d); extern void lmrcImageStdDev(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num); extern void lmrcImageStdErr(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num); diff --git a/src/Objects/DataManip/mrcImage/inc/mrcImage.h b/src/Objects/DataManip/mrcImage/inc/mrcImage.h index 772453c845..773d165040 100755 --- 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); extern void mrcImageInfoSet(mrcImage* mrc, FILE* fptIn, FILE* fptOut, long mode); /* in mrcImageOperation.c */ -extern void lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2); +extern void lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2); extern void lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se); extern void lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig); -extern void lmrcImageDevidedByReal(mrcImage* img, double d); -extern void lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d); +extern void lmrcImageDividedByReal(mrcImage* img, double d); +extern void lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d); extern void lmrcImageAddedByReal(mrcImage* img, double d); extern void lmrcImageStdDev(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num); extern void lmrcImageStdErr(mrcImage* sig, mrcImage* avg, mrcImage* avg2, long num); diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c b/src/Objects/DataManip/mrcImage/src/lmrcImageAverage.c index acb9b13f70..e1a33afa10 100644 --- 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) lmrcImageAdd(out, &(in[i]), &num); } if(num==n) { - lmrcImageDevidedByReal(out, (double)num); + lmrcImageDividedByReal(out, (double)num); } else { fprintf(stderr, "Something wrong: n %d != num %d\n", n, num); } diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageMontageCreate.c b/src/Objects/DataManip/mrcImage/src/lmrcImageMontageCreate.c index 17185fd8b2..c1b4eb4e92 100755 --- 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 0 1 2 - llinfo[shotID].avg[Edge][Devide] + llinfo[shotID].avg[Edge][Divide] */ avg[6] = sqrt((llinfo[6].avg[0][1]/(llinfo[3].avg[2][1]/(llinfo[3].avg[1][0]/llinfo[4].avg[3][0]))) diff --git a/src/Objects/DataManip/mrcImage/src/mrcImageOperation.c b/src/Objects/DataManip/mrcImage/src/mrcImageOperation.c index e2ceb03778..57ee49da88 100755 --- 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) } void -lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2) +lmrcImageDividedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2) { long ix, iy, iz; double ftmp1, ftmp2; @@ -68,7 +68,7 @@ lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2) if( i1->HeaderN.x!=i2->HeaderN.x || i1->HeaderN.y!=i2->HeaderN.y || i1->HeaderN.z!=i2->HeaderN.z ) { - fprintf(stderr, "ImageSize is different in lmrcImageDevidedByImage\n"); + fprintf(stderr, "ImageSize is different in lmrcImageDividedByImage\n"); exit(EXIT_FAILURE); } img->Header = i1->Header; @@ -111,17 +111,17 @@ lmrcImageDevidedByImage(mrcImage* img, mrcImage* i1, mrcImage* i2) void lmrcImagetMapForZero(mrcImage* t, mrcImage* avg, mrcImage* se) { - lmrcImageDevidedByImage(t, avg, se); + lmrcImageDividedByImage(t, avg, se); } void lmrcImageSN(mrcImage* sn, mrcImage* avg, mrcImage* sig) { - lmrcImageDevidedByImage(sn, avg, sig); + lmrcImageDividedByImage(sn, avg, sig); } void -lmrcImageDevidedByReal(mrcImage* img, double d) +lmrcImageDividedByReal(mrcImage* img, double d) { long ix, iy, iz; double ftmp; @@ -152,7 +152,7 @@ lmrcImageDevidedByReal(mrcImage* img, double d) } void -lmrcImageDevidedByRealForOnlyPositive(mrcImage* img, double d) +lmrcImageDividedByRealForOnlyPositive(mrcImage* img, double d) { long ix, iy, iz; double ftmp; @@ -255,7 +255,7 @@ void lmrcImageStdErr(mrcImage* se, mrcImage* avg, mrcImage* avg2, long number) { lmrcImageStdDev(se, avg, avg2, number); - lmrcImageDevidedByReal(se, number); + lmrcImageDividedByReal(se, number); } void diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc index 6e0025b483..0b977b19cd 100755 --- a/src/Tools/Config/Define.inc +++ b/src/Tools/Config/Define.inc @@ -126,3 +126,5 @@ WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools WORLDNAME=Tools +WORLDNAME=Tools +WORLDNAME=Tools diff --git a/src/Tools/mrcImage/.Source b/src/Tools/mrcImage/.Source index 7030321e82..275eca2a1d 100644 --- a/src/Tools/mrcImage/.Source +++ b/src/Tools/mrcImage/.Source @@ -95,6 +95,7 @@ mrcImageDisplayDensityAsTempFactor \ mrcImageDistanceConversion \ mrcImageDivideInfoForTomography \ mrcImageDivideIntoTwoImages \ +mrcImageDividedByFile \ mrcImageEdgeEnhancement \ mrcImageEdgeImageGet \ mrcImageEnhancementWithFuzzySets \ diff --git a/src/Tools/mrcImage/.Source.org b/src/Tools/mrcImage/.Source.org index 61f947a98e..7030321e82 100644 --- a/src/Tools/mrcImage/.Source.org +++ b/src/Tools/mrcImage/.Source.org @@ -128,6 +128,7 @@ mrcImageHighPassFilter \ mrcImageHighlighting \ mrcImageInfo \ mrcImageLabeling \ +mrcImageLogicalOperation \ mrcImageLowPassFilter \ mrcImageMagnificationChange \ mrcImageMake2DArrayImage \ diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/Config/Define.inc b/src/Tools/mrcImage/mrcImageDividedByFile/Config/Define.inc new file mode 100755 index 0000000000..2684a0555f --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/Config/Define.inc @@ -0,0 +1,4 @@ +OBJECTNAME = mrcImageDividedByFile +EXTRA_LIB = +EXTRA_CCOPTS = +EXTRA_INC = diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageDividedByFile/Config/OptionControlFile new file mode 100755 index 0000000000..d837ee084a --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/Config/OptionControlFile @@ -0,0 +1,7 @@ +# OptionControlFile +# FileFormat +"-i1","-i[nput]1","Input: In1","Essential","1","1","In1","inFile::mrcImage","NULL" +"-i2","-i[nput]2","Input: In2","Essential","1","1","In2","inFile::mrcImage","NULL" +"-o","-o[utput]","Output: In1/In2","Essential","1","1","Out","outFile::mrcImage","NULL" +"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL" +"-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0" diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/Config/Target.inc b/src/Tools/mrcImage/mrcImageDividedByFile/Config/Target.inc new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/Makefile b/src/Tools/mrcImage/mrcImageDividedByFile/Makefile new file mode 120000 index 0000000000..ef1f6300ba --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/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/mrcImageDividedByFile/doc/Makefile b/src/Tools/mrcImage/mrcImageDividedByFile/doc/Makefile new file mode 120000 index 0000000000..d75d7539e2 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/doc/Makefile @@ -0,0 +1 @@ +/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile \ No newline at end of file diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/inc/config.h b/src/Tools/mrcImage/mrcImageDividedByFile/inc/config.h new file mode 100755 index 0000000000..f04572e250 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/inc/config.h @@ -0,0 +1,6 @@ +#ifndef CONFIG_H +#define CONFIG_H + +#include "../inc/mrcImageDividedByFile.h" + +#endif /* CONFIG_H */ diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/inc/mrcImageDividedByFile.h b/src/Tools/mrcImage/mrcImageDividedByFile/inc/mrcImageDividedByFile.h new file mode 100755 index 0000000000..fffd59966f --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/inc/mrcImageDividedByFile.h @@ -0,0 +1,50 @@ +#ifndef MRCIMAGEDIVIDEDBYFILE_H +#define MRCIMAGEDIVIDEDBYFILE_H +#include +#include + +#define OPTION_FLAG '-' +#define OPTION_FLAG_POS (0) +#define OPTION_POS (1) + + + + +typedef struct mrcImageDividedByFileInfo { + long flagRedirect; + + long flagIn1; + char* In1; + FILE* fptIn1; + + long flagIn2; + char* In2; + FILE* fptIn2; + + long flagOut; + char* Out; + FILE* fptOut; + + long flagconfigFile; + char* configFile; + FILE* fptconfigFile; + + long flagmode; + long mode; + +} mrcImageDividedByFileInfo; +#ifdef __cplusplus +extern "C" { +#endif +extern void argCheck(mrcImageDividedByFileInfo* info, int argc, char* avgv[]); +extern void khorosInit(int argc, char* avgv[]); +extern void init0(mrcImageDividedByFileInfo* info); +extern void init1(mrcImageDividedByFileInfo* info); +extern void usage(char* usage); +extern void additionalUsage(void); +extern void htmlBeforeUsage(char* usage); +extern void htmlAfterUsage(char* usage); +#ifdef __cplusplus +}; +#endif +#endif /* MRCIMAGEDIVIDEDBYFILE_H */ diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/.Depend b/src/Tools/mrcImage/mrcImageDividedByFile/src/.Depend new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/.Source b/src/Tools/mrcImage/mrcImageDividedByFile/src/.Source new file mode 100755 index 0000000000..e69de29bb2 diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/Makefile b/src/Tools/mrcImage/mrcImageDividedByFile/src/Makefile new file mode 100755 index 0000000000..7beb110976 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/Makefile @@ -0,0 +1,427 @@ +include ../Config/Define.inc +include ../../Config/Define.inc +include ../../../Config/Define.inc +include ../../../../Config/Define.inc + +EOSHOME=../../../../../ +DSTDIR=$(EOSHOME)/bin +DSTDOC=$(EOSHOME)/doc +DSTTAR=$(EOSHOME)/tar + +INCFILES = + +LIBFILES = \ + $(LIBPREFIX)EosObjects$(LIBSUFFIX) + +LIBFILESDEBUG = \ + $(LIBPREFIX)EosObjects.debug$(LIBSUFFIX) + +SRCC = \ + $(OBJECTNAME).c \ + init.c \ + argCheck.c \ + usage.c \ + util.c \ + +SRCCXX = \ + $(OBJECTNAME).cc \ + init.cc \ + argCheck.cc \ + usage.cc \ + util.cc \ + +MODULES = \ + $(OBJECTNAME).o \ + init.o \ + argCheck.o \ + usage.o \ + util.o \ + +REALMODULES = \ + $(OSTYPE)/$(OBJECTNAME).o \ + $(OSTYPE)/init.o \ + $(OSTYPE)/argCheck.o \ + $(OSTYPE)/usage.o \ + $(OSTYPE)/util.o + +MODULESDEBUG = \ + $(OBJECTNAME).debugo \ + init.debugo \ + argCheck.debugo \ + usage.debugo \ + util.debugo \ + +REALMODULESDEBUG = \ + $(OSTYPE)/$(OBJECTNAME).debugo \ + $(OSTYPE)/init.debugo \ + $(OSTYPE)/argCheck.debugo \ + $(OSTYPE)/usage.debugo \ + $(OSTYPE)/util.debugo + + +all: $(OSTYPE)/$(OBJECTNAME) + if [ ! -L $(OSTYPE) ] ; then \ + moveHostdependent; \ + fi + +debug: $(OSTYPE)/$(OBJECTNAME).debug + +cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb + + +$(OSTYPE)/$(OBJECTNAME):: + @$(RM) -f $(OSTYPE)/Makefile ; \ + $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \ + cd $(OSTYPE); \ + $(MAKE) $(OBJECTNAME) WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) + +$(OSTYPE)/$(OBJECTNAME).debug:: + @$(RM) -f $(OSTYPE)/Makefile ; \ + $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \ + cd $(OSTYPE); \ + $(MAKE) $(OBJECTNAME).debug WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) + +$(OSTYPE)/$(OBJECTNAME).cudagdb:: + @$(RM) -f $(OSTYPE)/Makefile ; \ + $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \ + cd $(OSTYPE); \ + $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME) + +cvsupdate:: + cvs -d $(EOS_CVSROOT) update -d + +cvscommit:: + cvs -d $(EOS_CVSROOT) commit + +edit: + @if [ -r $(OBJECTNAME).c ]; \ + then \ + sccsEdit $(OBJECTNAME).c; \ + else \ + echo "Source files are already editable"; \ + fi + @if [ -r wish/$(OBJECTNAME).wish ]; \ + then \ + cd wish; sccsEdit $(OBJECTNAME).wish; \ + else \ + echo "Source files (wish) are already editable."; \ + fi + @if [ -r ruby/$(OBJECTNAME).rb ]; \ + then \ + cd ruby; sccsEdit $(OBJECTNAME).rb; \ + else \ + echo "Source files (ruby) are already editable."; \ + fi + @if [ -r perl/$(OBJECTNAME).pl ]; \ + then \ + cd perl; sccsEdit $(OBJECTNAME).pl ; \ + else \ + echo "Source files (perl) are already editable."; \ + fi + @if [ -r ../Config/OptionControlFile ]; \ + then \ + cd ../Config; sccsEdit OptionControlFile; \ + else \ + echo "OptionControlFile are already editable."; \ + fi + +unedit: + @if [ -w $(OBJECTNAME).c ]; \ + then \ + sccsUnedit $(OBJECTNAME).c; \ + else \ + echo "Source files are not editable"; \ + fi + @if [ -w wish/$(OBJECTNAME).wish ]; \ + then \ + cd wish; sccsUnedit $(OBJECTNAME).wish; \ + else \ + echo "Source files (wish) are not editable."; \ + fi + @if [ -w ruby/$(OBJECTNAME).rb]; \ + then \ + cd ruby; sccsUnedit $(OBJECTNAME).rb; \ + else \ + echo "Source files (ruby) are not editable."; \ + fi + @if [ -w perl/$(OBJECTNAME).pl ]; \ + then \ + cd perl; sccsUnedit $(OBJECTNAME).pl ; \ + else \ + echo "Source files (ruby) are not editable."; \ + fi + @if [ -w ../Config/OptionControlFile ]; \ + then \ + cd ../Config; sccsUnedit OptionControlFile; \ + else \ + echo "OptionControlFile are not editable."; \ + fi + +report: + @if [ -r $(OBJECTNAME).c ]; \ + then \ + sccsReport $(OBJECTNAME).c; \ + else \ + echo "Source files are already editable"; \ + fi + @if [ -r wish/$(OBJECTNAME).wish ]; \ + then \ + cd wish; sccsReport $(OBJECTNAME).wish; \ + else \ + echo "Source files (wish) are already editable."; \ + fi + @if [ -r ruby/$(OBJECTNAME).rb ]; \ + then \ + cd ruby; sccsReport $(OBJECTNAME).rb; \ + else \ + echo "Source files (ruby) are already editable."; \ + fi + @if [ -r perl/$(OBJECTNAME).pl ] ; \ + then \ + cd perl; sccsReport $(OBJECTNAME).pl ; \ + else \ + echo "Source files (perl) are already editable."; \ + fi + @if [ -r ../Config/OptionControlFile ]; \ + then \ + cd ../Config; sccsReport OptionControlFile; \ + else \ + echo "OptionControlFile are already editable."; \ + fi + +clean : + rm -f *.debugo $(OSTYPE)/*.debugo *.cudagdbo $(OSTYPE)/*.cudagdbo *.o $(OSTYPE)/*.o *.linkinfo $(OSTYPE)/*.linkinfo \ + $(OSTYPE)/$(OBJECTNAME) $(OSTYPE)/*.$(OSTYPE) \ + $(OSTYPE)/$(OBJECTNAME).debug $(OSTYPE)/*.$(OSTYPE).debug \ + $(OSTYPE)/$(OBJECTNAME).cudagdb $(OSTYPE)/*.$(OSTYPE).cudagdb \ + $(OSTYPE)/$(OBJECTNAME).linkinfo $(OSTYPE)/*.$(OSTYPE).linkinfo \ + *.bak *.$(OSTYPE) core + +install: install-bin install-doc install-wish install-ruby install-shell install-perl + @if [ dummy$(KHOROS_KENGOBJ) != dummy ] ; \ + then \ + if [ -x $(KHOROS_KGENOBJ) ] ; \ + then \ + make install-khoros ; \ + fi; \ + fi + +install-bin:$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) + +$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME):$(OSTYPE)/$(OBJECTNAME) $(DSTDIR)/$(OBJECTNAME) + @echo ---- Installing to bin + @echo $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME) + @if [ ! -d $(DSTDIR)/$(OSTYPE) ]; \ + then \ + mkdir $(DSTDIR)/$(OSTYPE); \ + fi + @if [ -x $(OSTYPE)/$(OBJECTNAME) ]; \ + then \ + echo "Compilation is complete"; \ + $(RM) -f $(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \ + $(CD) $(OSTYPE); $(INSTALL) -m 555 $(OBJECTNAME) ../$(DSTDIR)/$(OSTYPE); \ + $(CHMOD) 555 ../$(DSTDIR)/$(OSTYPE)/$(OBJECTNAME); \ + else \ + echo "Compilation is incomplete. $(OBJECTNAME)"; \ + fi + @echo ---- end of bin + +install-wish: + @if [ -d wish ]; \ + then \ + echo "---- Tcl/Tk file Install"; \ + if [ ! -d $(DSTDIR)/wish/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/wish/$(OBJECTNAME) ; \ + fi ; \ + $(CP) -f wish/* $(DSTDIR)/wish/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/wish/$(OBJECTNAME)/* ;\ + touch $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\ + $(CHMOD) 666 $(DSTDIR)/wish/$(OBJECTNAME)/tclIndex;\ + echo "---- Tcl/Tk file Installed";\ + fi + +install-ruby: + @if [ -d ruby ]; \ + then \ + echo "---- Ruby/Tk file Install"; \ + if [ ! -d $(DSTDIR)/ruby/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/ruby/$(OBJECTNAME) ; \ + fi ; \ + $(CP) -f ruby/* $(DSTDIR)/ruby/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/ruby/$(OBJECTNAME)/* ; \ + echo "---- Ruby/Tk file Installed"; \ + fi + +install-perl: + @if [ -d perl ]; \ + then \ + echo "---- Perl/Tk file Install"; \ + if [ ! -d $(DSTDIR)/perl/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/perl/$(OBJECTNAME) ; \ + fi; \ + $(CP) -f perl/* $(DSTDIR)/perl/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/perl/$(OBJECTNAME)/* ; \ + echo "---- Perl/Tk file Installed"; \ + fi + +install-shell: + @if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \ + fi + @if [ -d shell ]; \ + then \ + echo "---- Shell file Install"; \ + if [ ! -d $(DSTDIR)/shell/$(OBJECTNAME) ]; \ + then \ + mkdir $(DSTDIR)/shell/$(OBJECTNAME) ; \ + fi ; \ + $(CP) -f shell/* $(DSTDIR)/shell/$(OBJECTNAME); \ + $(CHMOD) 555 $(DSTDIR)/shell/$(OBJECTNAME)/*; \ + echo "---- Shell file Installed"; \ + fi + +install-khoros: + @echo Installing to khoros + @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KGENOBJ) ]; \ + then \ + echo kgenobj;\ + $(KHOROS_KGENOBJ) -tb Eos -oname $(OBJECTNAME) -type script -pane -cantata true -cat Eos -subcat $(CLASSNAME) -description $(OBJECTNAME) -bname $(OBJECTNAME) -form -lang ksh ; \ + fi + @if [ ! -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \ + then \ + $(KHOROS_KSET) -tb Eos -oname $(OBJECTNAME) -icon $(OBJECTNAME) ; \ + fi + @if [ -d ../../../../../objects/script/$(OBJECTNAME) -a -f $(KHOROS_KSET) ]; \ + then \ + $(CHMOD) -R 775 ../../../../../objects/script/$(OBJECTNAME) ; \ + if [ $? ] ; \ + then \ + echo "-- setting khoros ---" ; \ + if [ -d ../../../../../objects/script/$(OBJECTNAME)/uis/ ] ; \ + then \ + $(CD) ../../../../../objects/script/$(OBJECTNAME)/uis/ ; \ + $(RM) -f $(OBJECTNAME).pane ; \ + $(LN) -s ../../../../src/Tools/$(CLASSNAME)/$(OBJECTNAME)/src/$(OBJECTNAME).pane $(OBJECTNAME).pane; \ + $(CD) ../../ ; \ + $(CHMOD) -R 555 $(OBJECTNAME); \ + else \ + echo "../../../../../objects/script/$(OBJECTNAME)/uis/ does not exist."; \ + fi ; \ + else \ + echo "Failed !!: Cannot chage mode in installing $(OBJECTNAME) to khoros system"; \ + fi ; \ + echo "-- end of khoros-installing"; \ + fi + +install-doc: html + @if [ ! -d $(DSTDOC)/SmallTools ]; \ + then \ + mkdir $(DSTDOC)/SmallTools ;\ + fi + @if [ -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ]; \ + then \ + $(RM) -f $(DSTDOC)/SmallTools/$(OBJECTNAME).html ;\ + fi + @$(CP) $(OBJECTNAME).html $(DSTDOC)/SmallTools/$(OBJECTNAME).html + @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html + @if [ -f ../doc/*.html ]; \ + then \ + $(CP) ../doc/*.html $(DSTDOC)/SmallTools/ ;\ + fi + @$(CHMOD) 444 $(DSTDOC)/SmallTools/$(OBJECTNAME).html + @if [ -f $(DSTDOC)/SmallTools/Makefile ]; \ + then \ + cd $(DSTDOC)/SmallTools; $(MAKE); \ + fi + +html: $(OBJECTNAME).html + +configFileRead: + @ctrl2configFileRead $(CLASSNAME) $(OBJECTNAME) ../Config/OptionControlFile + +$(OBJECTNAME).html: $(OSTYPE)/$(OBJECTNAME) + @echo creating html + @$(OSTYPE)/$(OBJECTNAME) -html 2> $(OBJECTNAME).html.tmp + @sed -e s/$(OSTYPE)\\/// $(OBJECTNAME).html.tmp > $(OBJECTNAME).html + @$(RM) $(OBJECTNAME).html.tmp + +$(DSTDIR)/$(OBJECTNAME): $(OSTYPE)/$(OBJECTNAME) + @ln -s -f ../sbin/MachineIndependent $@ + +depend:: + @echo dependency checking now + @if [ ! -L $(OSTYPE) ] ; then \ + moveHostdependent; \ + fi + rm -f $(OSTYPE)/.Depend + #echo C + @if [ -f $(OBJECTNAME).c ] ; \ + then \ + echo "dependency: *.c"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) *.c >> $(OSTYPE)/.Depend ; \ + fi + #echo CC + @if [ -f $(OBJECTNAME).cc ] ; \ + then \ + echo "dependency: *.cc"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cc >> $(OSTYPE)/.Depend ; \ + fi + @if [ -f $(OBJECTNAME).ccm ] ; \ + then \ + echo "dependency: *.ccm"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.ccm >> $(OSTYPE)/.Depend ; \ + fi + @if [ -f $(OBJECTNAME).cu ] ; \ + then \ + echo "dependency: *.cu"; \ + echo $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu ; \ + $(DEPENDCOMMAND) $(INCLUDEDIR) $(EXTRA_INC) $(EXTRA_DEFINE) $(EXTRA_CCOPTS) *.cu >> $(OSTYPE)/.Depend ; \ + fi + +update:../Config/OptionControlFile + maketool $(CLASSNAME) $(OBJECTNAME) update + +changeName:: + +Test:$(OSTYPE)/$(OBJECTNAME) TestDir + @if [ -f test/Makefile ] ; \ + then \ + cd test; make ; \ + else \ + echo "No test Makefile"; \ + fi + +TestDir:: + @if [ ! -d test ] ; \ + then \ + echo "Creating test dir"; \ + mkdir test; \ + fi + @if [ ! -f test/Makefile ] ; \ + then \ + echo "Creating Makefile"; \ + cd test; \ + protoTestMakefileCreate; \ + fi + @if [ ! -d test/data ]; \ + then \ + mkdir $(EOSHOME)/data/$(OBJECTNAME); \ + cd test; \ + ln -sf ../$(EOSHOME)/data/$(OBJECTNAME) data; \ + fi + +tar:: + cd $(DSTTAR); tar cvf Tools.$(CLASSNAME).$(OBJECTNAME).tar ../bin/$(OBJECTNAME) \ + ../bin/*/$(OBJECTNAME).* \ + ../src/Tools/$(CLASSNAME)/$(OBJECTNAME) \ + ; gzip Tools.$(CLASSNAME).$(OBJECTNAME).tar + +-include $(OSTYPE)/.Depend +-include ../Config/Target.inc diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64 b/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64 new file mode 120000 index 0000000000..8269935d9b --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64 @@ -0,0 +1 @@ +../../../../../hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageDividedByFile/src/X86MAC64 \ No newline at end of file diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/argCheck.c b/src/Tools/mrcImage/mrcImageDividedByFile/src/argCheck.c new file mode 100755 index 0000000000..45f292dd02 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/argCheck.c @@ -0,0 +1,107 @@ +#include +#include +#include +#include +#include "../inc/config.h" +#include "genUtil.h" +#include "String.h" +#include "File.h" +#include "Memory.h" + + +void +argCheck(mrcImageDividedByFileInfo* info, int argc, char* argv[]) +{ + long i; + char s[1024]; + FILE* fpt; + + if(NULL==(fpt=fopen(".EosLog", "a+"))) { + + } else { + for(i=0; iIn1 = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagIn1++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("i2") { + if(i+1In2 = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagIn2++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("o") { + if(i+1Out = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagOut++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("c") { + if(i+1configFile = stringGetNthWord(argv[i+1], 1, " ,"); + i++; + info->flagconfigFile++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("m") { + if(i+1mode = stringGetNthIntegerData(argv[i+1], 1, " ,"); + i++; + info->flagmode++; + } else { + usage(argv[0]); + exit(EXIT_FAILURE); + } + SBREAK; + } + SCASE("h") { + usage(argv[0]); + exit(EXIT_SUCCESS); + break; + } + SCASE("html") { + htmlBeforeUsage(argv[0]); + usage(argv[0]); + htmlAfterUsage(argv[0]); + exit(EXIT_SUCCESS); + break; + } + SDEFAULT { + fprintf(stderr, "Not Supported Options: :%s\n", argv[i]); + usage(argv[0]); + exit(EXIT_FAILURE); + break; + } + SSWITCHEND; + } + } +} diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/init.c b/src/Tools/mrcImage/mrcImageDividedByFile/src/init.c new file mode 100755 index 0000000000..d42fd0974f --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/init.c @@ -0,0 +1,101 @@ +#include +#include +#include +#include +#include "../inc/config.h" +#include "genUtil.h" +#include "String.h" +#include "File.h" +#include "Memory.h" + + +void +init0(mrcImageDividedByFileInfo* info) +{ + info->fptIn1 = NULL; info->flagIn1 = 0; + info->fptIn2 = NULL; info->flagIn2 = 0; + info->fptOut = NULL; info->flagOut = 0; + info->fptconfigFile = NULL; info->flagconfigFile = 0; + info->mode = 0; info->flagmode = 0; +} + +void +init1(mrcImageDividedByFileInfo* info) +{ + char s[1024]; + int i; + if(!info->flagIn1) { + stringGetFromFile(s, "In1", stdin, stdout, 0); + info->In1 = stringGetNthWord(s, 1, " ,\t"); + info->flagIn1++; + } + if(info->flagIn1) { + info->fptIn1 = fileOpen(info->In1, "r"); + } + + if(!info->flagIn2) { + stringGetFromFile(s, "In2", stdin, stdout, 0); + info->In2 = stringGetNthWord(s, 1, " ,\t"); + info->flagIn2++; + } + if(info->flagIn2) { + info->fptIn2 = fileOpen(info->In2, "r"); + } + + if(!info->flagOut) { + stringGetFromFile(s, "Out", stdin, stdout, 0); + info->Out = stringGetNthWord(s, 1, " ,\t"); + info->flagOut++; + } + if(info->flagOut) { + info->fptOut = fileOpen(info->Out, "w"); + } + + if(info->flagconfigFile) { + info->fptconfigFile = fileOpen(info->configFile, "r"); + } + + if(info->flagmode) { + } + +} +#ifdef KHOROS +#include +#include "bootstrap.h" +#include "dataserv.h" +#include "datamanip.h" +extern void func_usage_additions(void); +extern void func_free_args(kexit_status status, kaddr client_data); +extern void func_get_args(kform* pane); + +void +func_usage_additions(void) +{ +} +void +func_free_args(kexit_status status, kaddr client_data) +{ +} +void +func_get_args(kform* pane) +{ +} +void +khorosInit(int argc, char* argv[]) +{ + char* eospath; + char panepath[1024]; + FILE* fpt; + + eospath = getenv("EOS_HOME"); + sprintf(panepath, "%s/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.pane", eospath); + khoros_initialize(argc, argv, "EOS"); + fpt = fopen(panepath, "r"); if(NULL!=fpt) { + fclose(fpt); + kclui_initialize(panepath, KGEN_NONE, "EOS", "mrcImageDividedByFile", + func_usage_additions, + func_get_args, + func_free_args); + } +} +#endif /* KHOROS */ diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.c b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.c new file mode 100755 index 0000000000..0e5bdaa461 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.c @@ -0,0 +1,61 @@ +/* +# mrcImageDividedByFile : $Revision$ +# $Date$ +# Created by $Author$ +# Usage : mrcImageDividedByFile +# Attention +# $Loccker$ +# $State$ +# +*/ +#include +#include +#include +#include +#define GLOBAL_DECLARATION +#include "../inc/config.h" + +#define DEBUG +#include "genUtil.h" +#include "mrcImage.h" + +/* +Example: +typedef struct lmrcImageDividedByFileInfo { + float a; + int b; +} lmrcImageDividedByFileInfo; + +typedef enum lmrcImageDividedByFileMode { + a=0, + b=1 +} lmrcImageDividedByFileMode; +*/ + +int +main(int argc, char* argv[]) +{ + mrcImageDividedByFileInfo info; + mrcImage in1; + mrcImage in2; + mrcImage out; + + init0(&info); + argCheck(&info, argc, argv); + init1(&info); + + DEBUGPRINT("Program Start\n"); + mrcFileRead(&in1, info.In1, "in main", 0); + mrcFileRead(&in2, info.In2, "in main", 0); + + lmrcImageDividedByImage(&out, &in1, &in2); + + mrcFileWrite(&out, info.Out, "in main", 0); + exit(EXIT_SUCCESS); +} + +void +additionalUsage() +{ + fprintf(stderr, "----- Additional Usage -----\n"); +} diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.html b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.html new file mode 100644 index 0000000000..4deb380ed2 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.html @@ -0,0 +1,19 @@ + + +mrcImageDividedByFile + + +

mrcImageDividedByFile

+

Usage

+
+Usage: mrcImageDividedByFile
+Options:
+    [-i[nput]1           In1                 (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: In1
+    [-i[nput]2           In2                 (NULL      ).as(inFile::mrcImage    ) ] :Essential :Input: In2
+    [-o[utput]           Out                 (NULL      ).as(outFile::mrcImage   ) ] :Essential :Output: In1/In2
+    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode
+----- Additional Usage -----
+
+ + diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.pane b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.pane new file mode 100755 index 0000000000..725a0e8a9e --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/mrcImageDividedByFile.pane @@ -0,0 +1,17 @@ +-F 4.3 1 0 52x1+0+0 +0+0 'Cantata' cantata + -M 1 1 52x1+0+0 +1+0 ' ' subform + -P 1 0 52x1+0+1 +0+0 ' ' mrcImageDividedByFile + -D 1 0 9x1+0+0 'Options' _gui_options + -H 1 6x1+0+0 'License' 'license' $BOOTSTRAP/repos/license/License license + -E + -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrcImageDividedByFile + -H 1 5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageDividedByFile/doc/mrcImageDividedByFile.doc help + -Q 1 0 5.25x1+47+0 'Close' + -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In1' 'Input: In1' i1 + -I 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'In2' 'Input: In2' i2 + -O 1 0 1 1 0 1 -1x1+1+4.500000 ' ' 'Out' 'Output: In1/In2' o + -I 1 0 1 0 0 1 -1x1+1+6.000000 ' ' 'configFile' 'ConfigurationFile' c + -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'mode' 'Mode' m + -E + -E +-E diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/test/Makefile b/src/Tools/mrcImage/mrcImageDividedByFile/src/test/Makefile new file mode 100644 index 0000000000..64a98bb49f --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/test/Makefile @@ -0,0 +1,17 @@ +include ../../Config/Define.inc +include ../../../Config/Define.inc +include ../../../../Config/Define.inc +include ../../../../../Config/Define.inc + +all: help exec + +help: + @echo "----- Help Message Check -----" + @../$(OSTYPE)/$(OBJECTNAME) -h + +exec: + @echo "----- Execution Check -----" + ../$(OSTYPE)/$(OBJECTNAME) -i1 data/121p-move.mrc -i2 data/121p-move.mrc -o data/test.out + @echo "----- Calc check -----" + +clean: diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/test/data b/src/Tools/mrcImage/mrcImageDividedByFile/src/test/data new file mode 120000 index 0000000000..aacbbab80f --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/test/data @@ -0,0 +1 @@ +../../../../../..//data/mrcImageDividedByFile \ No newline at end of file diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/usage.c b/src/Tools/mrcImage/mrcImageDividedByFile/src/usage.c new file mode 100755 index 0000000000..0e89c1711b --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/usage.c @@ -0,0 +1,37 @@ +#include +#include +#include "../inc/config.h" + +void +usage(char* thisProgram) +{ + fprintf(stderr, "Usage: %s\n", thisProgram); + fprintf(stderr, "Options:\n"); + fprintf(stderr, " [-i[nput]1 In1 (NULL ).as(inFile::mrcImage ) ] :Essential :Input: In1\n"); + fprintf(stderr, " [-i[nput]2 In2 (NULL ).as(inFile::mrcImage ) ] :Essential :Input: In2\n"); + fprintf(stderr, " [-o[utput] Out (NULL ).as(outFile::mrcImage ) ] :Essential :Output: In1/In2\n"); + fprintf(stderr, " [-c[onfig] configFile (NULL ).as(inFile ) ] :Optional :ConfigurationFile\n"); + fprintf(stderr, " [-m[ode] mode (0 ).as(Integer ) ] :Optional :Mode\n"); + additionalUsage(); +} + +void +htmlBeforeUsage(char* thisProgram) +{ + fprintf(stderr, "\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "%s\n", thisProgram); + fprintf(stderr, "\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "

%s

\n", thisProgram); + fprintf(stderr, "

Usage

\n"); + fprintf(stderr, "
\n");
+}
+
+void
+htmlAfterUsage(char* thisProgram)
+{
+    fprintf(stderr, "
\n"); + fprintf(stderr, "\n"); + fprintf(stderr, "\n"); +} diff --git a/src/Tools/mrcImage/mrcImageDividedByFile/src/util.c b/src/Tools/mrcImage/mrcImageDividedByFile/src/util.c new file mode 100755 index 0000000000..ee5e5f2324 --- /dev/null +++ b/src/Tools/mrcImage/mrcImageDividedByFile/src/util.c @@ -0,0 +1,4 @@ +#include +#include +#include "../inc/config.h" +