Ticke: #34276

	modified:   src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
	typechange: src/Tools/mrcImage/mrcImageSiemensStar/Makefile
	modified:   src/Tools/mrcImage/mrcImageSiemensStar/doc/Makefile
	modified:   src/Tools/mrcImage/mrcImageSiemensStar/inc/mrcImageSiemensStar.h
	modified:   src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c
	modified:   src/Tools/mrcImage/mrcImageSiemensStar/src/test/Makefile

Not yet:
	new file:   env/install-eos.sh
	modified:   hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/.Depend
	modified:   hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/Makefile

diff --git a/env/install-eos.sh b/env/install-eos.sh
new file mode 100755 (executable)
index 0000000..c14bc14
--- /dev/null
+++ b/env/install-eos.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+#### 
+EOS_HOME0=$HOME/Eos
+echo "Set the directroy to be installed [$EOS_HOME0]: "; read ANS
+if [ ! -z $ANS ] ; then 
+       EOS_HOME0=$ANS;
+else 
+       EOS_HOME0=$HOME/Eos; 
+fi
+unset ANS
+echo "Directory: $EOS_HOME0";
+
+#### No Change
+ROOT_EOS_SOURCEFORGE=https://sourceforge.jp/projects/eos/scm/git/base/blobs/master/env/Eos_env
+if [ ! -d $EOS_HOME0 ] ; then
+       mkdir $EOS_HOME0
+fi
+
+curl -L $ROOT_EOS_SOURCEFORGE/env/Eos_env
+
+
+

diff --git a/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/.Depend b/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/.Depend
index e4b5500..f37410c 100644 (file)
--- a/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/.Depend
+++ b/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/.Depend
@@ -1,116 +1,131 @@
-argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/sys/cdefs.h \
+cufft.o: cufft.cu /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/secure/_stdio.h \
-  /usr/include/secure/_common.h /usr/include/stdlib.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.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/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/machine/types.h /usr/include/i386/types.h \
-  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
-  /usr/include/math.h ../inc/config.h ../inc/../inc/mrcImageFFT.h \
-  /Applications/Eos.app/Eos/include/genUtil.h \
-  /Applications/Eos.app/Eos/include/String.h \
-  /Applications/Eos.app/Eos/include/File.h \
-  /Applications/Eos.app/Eos/include/Memory.h \
-  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
-  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
-  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
-  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.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/cufft.h /Users/tacyas/Eos/include/genUtil.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/iostream \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__config \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/ios \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/iosfwd \
+  /usr/include/wchar.h /usr/include/sys/_types/_mbstate_t.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stdarg.h \
+  /usr/include/time.h /usr/include/_structs.h \
+  /usr/include/sys/_structs.h /usr/include/sys/_types/_timespec.h \
+  /usr/include/sys/_types/_clock_t.h /usr/include/sys/_types/_time_t.h \
+  /usr/include/_wctype.h /usr/include/sys/_types/_wint_t.h \
+  /usr/include/_types/_wctype_t.h /usr/include/ctype.h \
+  /usr/include/runetype.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__locale \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/string \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cstring \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cstdio \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cwchar \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cwctype \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cctype \
+  /usr/include/wctype.h /usr/include/_types/_wctrans_t.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/algorithm \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/initializer_list \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cstddef \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/include/stddef.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/type_traits \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/utility \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__tuple \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__tuple_03 \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/memory \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/typeinfo \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/exception \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cstdint \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/new \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/limits \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__undef_min_max \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/iterator \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__functional_base \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__functional_base_03 \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/tuple \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/stdexcept \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/mutex \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__mutex_base \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/chrono \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/ctime \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/ratio \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/climits \
+  /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
-cufft.o: cufft.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/secure/_stdio.h \
-  /usr/include/secure/_common.h /usr/include/stdlib.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.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/machine/types.h /usr/include/i386/types.h \
-  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
-  /usr/include/math.h ../inc/config.h ../inc/../inc/mrcImageFFT.h \
-  /Applications/Eos.app/Eos/include/mrcImage.h \
-  /Applications/Eos.app/Eos/include/genUtil.h \
-  /Applications/Eos.app/Eos/include/ctfInfo.h \
-  /Applications/Eos.app/Eos/include/Vector.h \
-  /Applications/Eos.app/Eos/include/Matrix3D.h \
-  /Applications/Eos.app/Eos/include/Array.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/secure/_stdio.h \
-  /usr/include/secure/_common.h /usr/include/stdlib.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.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/machine/types.h /usr/include/i386/types.h \
-  /usr/include/i386/_types.h /Applications/Eos.app/Eos/include/string.h \
-  /usr/include/math.h ../inc/config.h ../inc/../inc/mrcImageFFT.h \
-  /Applications/Eos.app/Eos/include/genUtil.h \
-  /Applications/Eos.app/Eos/include/String.h \
-  /Applications/Eos.app/Eos/include/File.h \
-  /Applications/Eos.app/Eos/include/Memory.h \
-  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
-  /usr/llvm-gcc-4.2/bin/../lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.h \
-  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/limits.h \
-  /Applications/Xcode.app/Contents/Developer/usr/llvm-gcc-4.2/lib/gcc/i686-apple-darwin11/4.2.1/include/syslimits.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
-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/secure/_stdio.h \
-  /usr/include/secure/_common.h /usr/include/stdlib.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.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/machine/types.h /usr/include/i386/types.h \
-  /usr/include/i386/_types.h ../inc/config.h ../inc/../inc/mrcImageFFT.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/secure/_stdio.h \
-  /usr/include/secure/_common.h /usr/include/stdlib.h \
-  /usr/include/sys/wait.h /usr/include/sys/signal.h \
-  /usr/include/sys/appleapiopts.h /usr/include/machine/signal.h \
-  /usr/include/i386/signal.h /usr/include/i386/_structs.h \
-  /usr/include/sys/_structs.h /usr/include/machine/_structs.h \
-  /usr/include/mach/i386/_structs.h /usr/include/sys/resource.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/machine/types.h /usr/include/i386/types.h \
-  /usr/include/i386/_types.h ../inc/config.h ../inc/../inc/mrcImageFFT.h
+  /usr/include/sys/syslimits.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/system_error \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cerrno \
+  /usr/include/errno.h /usr/include/sys/errno.h /usr/include/pthread.h \
+  /usr/include/pthread_impl.h /usr/include/sched.h \
+  /usr/include/sys/_types/_pthread_cond_t.h \
+  /usr/include/sys/_types/_pthread_condattr_t.h \
+  /usr/include/sys/_types/_pthread_key_t.h \
+  /usr/include/sys/_types/_pthread_mutex_t.h \
+  /usr/include/sys/_types/_pthread_mutexattr_t.h \
+  /usr/include/sys/_types/_pthread_once_t.h \
+  /usr/include/sys/_types/_pthread_rwlock_t.h \
+  /usr/include/sys/_types/_pthread_rwlockattr_t.h \
+  /usr/include/sys/_types/_pthread_t.h \
+  /usr/include/sys/_types/_mach_port_t.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/functional \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__functional_03 \
+  /usr/include/locale.h /usr/include/_locale.h /usr/include/xlocale.h \
+  /usr/include/_xlocale.h /usr/include/xlocale/_ctype.h \
+  /usr/include/xlocale/__wctype.h /usr/include/xlocale/_stdio.h \
+  /usr/include/xlocale/_stdlib.h /usr/include/xlocale/_time.h \
+  /usr/include/xlocale/_wchar.h /usr/include/xlocale/_wctype.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/streambuf \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/istream \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/ostream \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/locale \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/cstdlib \
+  /usr/include/nl_types.h /usr/include/sys/types.h \
+  /usr/include/sys/_types/_blkcnt_t.h \
+  /usr/include/sys/_types/_blksize_t.h /usr/include/sys/_types/_gid_t.h \
+  /usr/include/sys/_types/_in_addr_t.h \
+  /usr/include/sys/_types/_in_port_t.h /usr/include/sys/_types/_ino_t.h \
+  /usr/include/sys/_types/_ino64_t.h /usr/include/sys/_types/_key_t.h \
+  /usr/include/sys/_types/_nlink_t.h \
+  /usr/include/sys/_types/_useconds_t.h \
+  /usr/include/sys/_types/_suseconds_t.h \
+  /usr/include/sys/_types/_rsize_t.h /usr/include/sys/_types/_errno_t.h \
+  /usr/include/sys/_types/_fd_def.h \
+  /usr/include/sys/_types/_fd_setsize.h \
+  /usr/include/sys/_types/_fd_set.h /usr/include/sys/_types/_fd_clr.h \
+  /usr/include/sys/_types/_fd_zero.h /usr/include/sys/_types/_fd_isset.h \
+  /usr/include/sys/_types/_fd_copy.h \
+  /usr/include/sys/_types/_fsblkcnt_t.h \
+  /usr/include/sys/_types/_fsfilcnt_t.h /usr/include/_types/_nl_item.h \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/bitset \
+  /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/c++/v1/__bit_reference

diff --git a/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/Makefile b/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/Makefile
index f938d74..ec61247 100755 (executable)
--- a/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/Makefile
+++ b/hostdepend/X86MAC64/src/Tools/Test/cufft/src/X86MAC64/Makefile
@@ -1,7 +1,7 @@
-include ../../Config/Define.inc
-include ../../../Config/Define.inc
-include ../../../../Config/Define.inc
-include ../../../../../Config/DefineTool.inc
+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) 
@@ -60,47 +60,47 @@ REALMODULESDEBUG    = \
 
 
 $(OBJECTNAME): $(MODULES) $(LIBFILES)
-       @if [ -f ../$(OBJECTNAME).c ] ; \
+       @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 ../$(OBJECTNAME).cc ] ; \
+       @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 ../$(OBJECTNAME).ccm ] ; \
+       @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 ../$(OBJECTNAME).cu ] ; \
+       @if [ -f $(VPATH)/$(OBJECTNAME).cu ] ; \
        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 $@ ;  \
+               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 ../$(OBJECTNAME).c ] ; \
+       @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 ../$(OBJECTNAME).cc ] ; \
+       @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 ../$(OBJECTNAME).ccm ] ; \
+       @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 ../$(OBJECTNAME).cu ] ; \
+       @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 $@ ;  \
@@ -111,4 +111,4 @@ $(OBJECTNAME).cudagdb: $(MODULESCUDAGDB) $(LIBFILESDEBUG)
        $(NVCC) $(NVCCOPTSCUDAGDB) $(MODULESCUDAGDB) $(LIBFILESDEBUG) $(EXTRA_LIB) $(KHOROS_LIBS) $(LIBPVM) $(STANDARDLIB) $(HOSTDEPENDENTLIB) -o $@
 
 include ./.Depend
-include ../../Config/Target.inc
+include  $(EOS_HOME)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config/Target.inc

diff --git a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar
index 845802a..9ade48e 100755 (executable)
Binary files a/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar and b/hostdepend/X86MAC64/src/Tools/mrcImage/mrcImageSiemensStar/src/X86MAC64/mrcImageSiemensStar differ

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 2e108f9..a71ea9d 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -155,3 +155,4 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/Test/cufft/src/cufft.cu b/src/Tools/Test/cufft/src/cufft.cu
index 1f30a18..eb2e949 100755 (executable)
--- a/src/Tools/Test/cufft/src/cufft.cu
+++ b/src/Tools/Test/cufft/src/cufft.cu
@@ -8,6 +8,8 @@
 #      $State$ 
 #
 */
+
+extern "C" {
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -17,22 +19,11 @@
 
 #define DEBUG
 #include "genUtil.h"
+};
 
-/*
-Example:
-typedef struct lcufftInfo {
-       float a;
-       int   b;
-} lcufftInfo;
-
-typedef enum lcufftMode {
-       a=0,
-       b=1
-} lcufftMode;
-*/
 #include <iostream>
-#include <string.h>
-#include <math.h>
+
+
 //#include <cutil.h>
 
 // デバイス関数(GPU側で実行する処理を記述)

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
index f063873..63232de 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/Config/OptionControlFile
@@ -6,4 +6,5 @@
 "-n","-n[umber]","nOfRadial","Optional","1","1","nRadial","Integer","18"
 "-delta","-delta","Delta[A]","Optional","1","1","Delta","Real","1.72"
 "-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
+"-Shape","-Shape","Mode","Optional","1","1","Shape","Integer","0"
 "-m","-m[ode]","Mode","Optional","1","1","mode","Integer","0"

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/Makefile b/src/Tools/mrcImage/mrcImageSiemensStar/Makefile
deleted file mode 100755 (executable)
index 4dbb018acae5475bce203b3db2365124accfa24b..0000000000000000000000000000000000000000
--- a/src/Tools/mrcImage/mrcImageSiemensStar/Makefile
+++ /dev/null
@@ -1,104 +0,0 @@
-include ../../../Config/Define.inc
-include ../../Config/Define.inc
-include ../Config/Define.inc
-include Config/Define.inc
-
-all:
-       cd src; make all; cd ..
-
-install:
-       cd src; make install; cd ..
-
-
-putSF:
-       if [ -f private ] ; \
-       then \
-               echo "$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME) is private"; \
-       else \
-               cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE commit || cvs -z4 -d:ext:$$USER@$$EOS_SOURCEFORGE import src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME); \
-       fi
-
-put:
-       cd src; make put; cd ..
-
-clean:
-       cd src; make clean; cd ..
-
-depend:
-       cd src; make depend; cd ..
-
-check:
-       @if [ ! -d $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) ] ; then \
-               echo making directory; \
-               mkdir -p $(EOS_HOME)/hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE); \
-       fi
-       ln -sf ../../../../../hostdepend/$(OSTYPE)/src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE) src/$(OSTYPE); 
-       @$(RM) src/Makefile
-       @echo "New src/Makefile" 
-       @$(CP) ../../../Config/Template/$(WORLDNAME)Template.Dir/src/Makefile src/Makefile
-       @cd src; touch $(OSTYPE)/.Depend; make depend
-
-cvsupdate::
-       cvs -d $(EOS_CVSROOT) update -d 
-
-cvscommit::
-       cvs -d $(EOS_CVSROOT) commit
-
-backup:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-
-backup-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config       ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/backup/EosBase.tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile
-       
-distribute:
-       cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar uvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-       
-distribute-all:
-       @cd ../../../..;     \
-       echo $(OBJECTNAME) ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Config     ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/Makefile ;\
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/.[A-z]* ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/inc ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/doc; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/wish; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/[A-z]*.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/.[A-z]*; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/Makefile ; \
-       tar rvf ${EOS_HOME}/distribute/src.$(OSTYPE).tar src/$(WORLDNAME)/$(CLASSNAME)/$(OBJECTNAME)/src/$(OSTYPE)
-
-eosintroduce:
-       ${EOS_HOME}/sbin/eosintroduce ${WORLDNAME} ${CLASSNAME} ${OBJECTNAME} ./ 
-
-include Config/Target.inc

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/Makefile b/src/Tools/mrcImage/mrcImageSiemensStar/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..ef1f6300ba0b84da4931ed574ccec31fc5b88177
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/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/mrcImageSiemensStar/doc/Makefile b/src/Tools/mrcImage/mrcImageSiemensStar/doc/Makefile
index e35804f..d75d753 120000 (symlink)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/doc/Makefile
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/doc/Makefile
@@ -1 +1 @@
-/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file
+/Users/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/inc/mrcImageSiemensStar.h b/src/Tools/mrcImage/mrcImageSiemensStar/inc/mrcImageSiemensStar.h
index 6b4e818..957b8cf 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/inc/mrcImageSiemensStar.h
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/inc/mrcImageSiemensStar.h
@@ -36,6 +36,9 @@ typedef struct mrcImageSiemensStarInfo {
     char* configFile;
     FILE* fptconfigFile;
     
+    long flagShape;
+    long Shape;
+    
     long flagmode;
     long mode;
     

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/argCheck.c b/src/Tools/mrcImage/mrcImageSiemensStar/src/argCheck.c
index 3511b64..b58d8d3 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/argCheck.c
@@ -12,7 +12,7 @@
 void
 argCheck(mrcImageSiemensStarInfo* info, int argc, char* argv[])
 {
-    long i, j, nv;
+    long i;
     char s[1024];
     FILE* fpt;
     
@@ -97,6 +97,17 @@ argCheck(mrcImageSiemensStarInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("Shape") {
+                    if(i+1<argc) {
+                        info->Shape = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagShape++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("m") {
                     if(i+1<argc) {
                         info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c b/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c
index fb4fcde..1bb282b 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/init.c
@@ -14,11 +14,12 @@ init0(mrcImageSiemensStarInfo* info)
 {
     info->fptOut = NULL;    info->flagOut = 0;
     info->Nx = 256;    info->flagNx = 0;
-    info->Ny = 256;    info->flagNy = 0;
+    info->Nx = 256;    info->flagNx = 0;
     info->R = 64;    info->flagR = 0;
     info->nRadial = 18;    info->flagnRadial = 0;
     info->Delta = 1.72;    info->flagDelta = 0;
     info->fptconfigFile = NULL;    info->flagconfigFile = 0;
+    info->Shape = 0;    info->flagShape = 0;
     info->mode = 0;    info->flagmode = 0;
 }
 
@@ -55,6 +56,9 @@ init1(mrcImageSiemensStarInfo* info)
         info->fptconfigFile = fileOpen(info->configFile, "r");
     }
     
+    if(info->flagShape) {
+    }
+    
     if(info->flagmode) {
     }
     

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c b/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c
index 58207db..d95c5ad 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.c
@@ -25,6 +25,8 @@ typedef struct lmrcImageSiemensStarInfo {
        double R; // [pixel]
        int    nOfRadial; 
        float  delta;
+
+       int    Shape;
 } lmrcImageSiemensStarInfo;
 /*
 typedef enum lmrcImageSiemensStarMode {
@@ -52,6 +54,7 @@ main(int argc, char* argv[])
        linfo.R  = info.R;
        linfo.nOfRadial = info.nRadial;
        linfo.delta =  info.Delta;
+       linfo.Shape = info.Shape;
 
        lmrcImageSiemensStarCreate(&out, linfo, info.mode);
 
@@ -64,6 +67,11 @@ additionalUsage()
 {
        fprintf(stderr, "----- Additional Usage -----\n");
        fprintf(stderr, "-mode : mrcImageHeaderMode: 2 float");
+       fprintf(stderr, "                            0 char");
+       fprintf(stderr, "-Shape  0 : SiemensStar(Step)");
+       fprintf(stderr, "-Shape  1 : SiemensStar(Cos)");
+       fprintf(stderr, "-Shape  2 : Linear(Step)");
+       fprintf(stderr, "-Shape  3 : Linear(Cos)");
 }
 
 
@@ -74,6 +82,7 @@ lmrcImageSiemensStarCreate(mrcImage* out, lmrcImageSiemensStarInfo linfo, int mo
        mrcImageParaTypeReal gx, gy;
        double data;
        double r, theta;
+       double w, h, xx, yy;
        int flagTheta;
        double dTheta;
 
@@ -92,17 +101,61 @@ lmrcImageSiemensStarCreate(mrcImage* out, lmrcImageSiemensStarInfo linfo, int mo
        for(x=0; x<out->HeaderN.x; x++) {
        for(y=0; y<out->HeaderN.y; y++) {
                r = sqrt(SQR(x-gx)+SQR(y-gy));                  
+               w = x-gx;
+               h = y-gy;
                theta = atan2(y-gy, x-gx);
-               if(0<=theta) {
-                       flagTheta = (int)(( theta - ((int)(theta/dTheta))*dTheta)/(dTheta/2.0)); 
-               } else {
-                       flagTheta = 1 - (int)((-theta + ((int)(theta/dTheta))*dTheta)/(dTheta/2.0)); 
-               }
-               if(flagTheta==1 && r<=linfo.R) {
-                       data = 1;
-               } else {
-                       data = 0;
-               }
+               switch(linfo.Shape) {
+                       case 0: {
+                               if(0<=theta) {
+                                       flagTheta = (int)(( theta - ((int)(theta/dTheta))*dTheta)/(dTheta/2.0)); 
+                               } else {
+                                       flagTheta = 1 - (int)((-theta + ((int)(theta/dTheta))*dTheta)/(dTheta/2.0)); 
+                               }
+                               if(flagTheta==1 && r<=linfo.R) {
+                                       data = 1;
+                               } else {
+                                       data = 0;
+                               }
+                               break;
+                       }
+                       case 1: {
+                               if(r<=linfo.R) {
+                                       data = cos(theta*linfo.nOfRadial);
+                               } else {
+                                       data = 0;
+                               }
+                               break;
+                       }
+                       case 2: {
+                               if(fabs(w)<=linfo.R && fabs(h)<=linfo.R) {
+                                       xx = (w+linfo.R)/(2*linfo.R);
+                                       yy = (h+linfo.R)/(2*linfo.R);
+                                       data = (cos(linfo.nOfRadial*(1/(1-xx))*xx)*cos(linfo.nOfRadial*(1/(1-yy))*yy));
+                                       if(data>0) { 
+                                               data = 1;
+                                       } else {
+                                               data = 0;
+                                       }
+                               } else {
+                                       data = 0;
+                               }
+                               break;
+                       }
+                       case 3: {
+                               if(fabs(w)<=linfo.R && fabs(h)<=linfo.R) {
+                                       xx = (w+linfo.R)/(2*linfo.R);
+                                       yy = (h+linfo.R)/(2*linfo.R);
+                                       data = (cos(linfo.nOfRadial*(1/(1-xx))*xx)*cos(linfo.nOfRadial*(1/(1-yy))*yy));
+                               } else {
+                                       data = 0;
+                               }
+                               break;
+                       }
+                       default: {
+                               fprintf(stderr, "Not supported Mode: %d\n", linfo.Shape);
+                               exit(EXIT_FAILURE);
+                       }
+               }       
                mrcPixelDataSet(out, x, y, 0, data, mrcPixelRePart);
        }
        }

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.pane b/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.pane
index 6c5954e..139032a 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.pane
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/mrcImageSiemensStar.pane
@@ -13,7 +13,8 @@
         -i 1 0 1 0 0 -1x1+1+6.000000 0 0 18 0 0 'nRadial' 'nOfRadial' n
         -f 1 0 1 0 0 -1x1+1+7.500000 0 0 1.720000 0 0 0 'Delta' 'Delta[A]' delta
         -I 1 0 1 0 0 1 -1x1+1+9.000000 ' ' 'configFile' 'ConfigurationFile' c
-        -i 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'mode' 'Mode' m
+        -i 1 0 1 0 0 -1x1+1+10.500000 0 0 0 0 0 'Shape' 'Mode' Shape
+        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 0 0 0 'mode' 'Mode' m
     -E
   -E
 -E

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/test/Makefile b/src/Tools/mrcImage/mrcImageSiemensStar/src/test/Makefile
index e41e58d..51a60f0 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/test/Makefile
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/test/Makefile
@@ -12,6 +12,9 @@ help:
 exec:
        @echo "----- Execution Check -----"
        ../$(OSTYPE)/$(OBJECTNAME) -o data/test.out -N 256 256 -R 128 -n 18 -delta 1.72
+       ../$(OSTYPE)/$(OBJECTNAME) -o data/test-1.out -N 256 256 -R 128 -n 18 -delta 1.72 -Shape 1 -m 2
+       ../$(OSTYPE)/$(OBJECTNAME) -o data/test-2.out -N 256 256 -R 128 -n 18 -delta 1.72 -Shape 2 -m 2
+       ../$(OSTYPE)/$(OBJECTNAME) -o data/test-3.out -N 512 512 -R 200 -n 18 -delta 1.72 -Shape 3 -m 2
        @echo "----- Calc check -----"          
 
 clean:

diff --git a/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c b/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c
index 82b69c5..eead40a 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageSiemensStar/src/usage.c
@@ -7,13 +7,14 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
-    fprintf(stderr, "    [-N[umber]           Nx                  (256       )Ny                  (256       )] :Optional  :Number[pixel]\n");
-    fprintf(stderr, "    [-R[adius]           R                   (64        )] :Optional  :Radius[pixel]\n");
-    fprintf(stderr, "    [-n[umber]           nRadial             (18        )] :Optional  :nOfRadial\n");
-    fprintf(stderr, "    [-delta              Delta               (1.72      )] :Optional  :Delta[A]\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
-    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :Mode\n");
+    fprintf(stderr, "    [-o[utput]           Out                 (NULL      ).as(outFile             ) ] :Essential :OutputDataFile\n");
+    fprintf(stderr, "    [-N[umber]           Nx                  (256       ).as(Integer             ) \n                         Ny                  (256       ).as(Integer             ) ] :Optional  :Number[pixel]\n");
+    fprintf(stderr, "    [-R[adius]           R                   (64        ).as(Integer             ) ] :Optional  :Radius[pixel]\n");
+    fprintf(stderr, "    [-n[umber]           nRadial             (18        ).as(Integer             ) ] :Optional  :nOfRadial\n");
+    fprintf(stderr, "    [-delta              Delta               (1.72      ).as(Real                ) ] :Optional  :Delta[A]\n");
+    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      ).as(inFile              ) ] :Optional  :ConfigurationFile\n");
+    fprintf(stderr, "    [-Shape              Shape               (0         ).as(Integer             ) ] :Optional  :Mode\n");
+    fprintf(stderr, "    [-m[ode]             mode                (0         ).as(Integer             ) ] :Optional  :Mode\n");
     additionalUsage();
 }