Bug fixed: Compile error on OS-X : mrcImageClusterAnalysis

	modified:   src/Objects/General/Cluster/src/clusterLogRead.c

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis
index f4d7bfd..71e85e4 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageClusterAnalysis differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.a
index 8a6b14b..5306e27 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.so b/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.so
index c236f1b..c4f4cef 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.so and b/hostdepend/X86LINUX64/lib/X86LINUX64/libCluster.so differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
index c6c4ef3..ee5727e 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so
index 82a5317..e04dff7 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so and b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.so differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/clusterLogRead.sharedo b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/clusterLogRead.sharedo
index 9db58c9..6f0d32a 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/clusterLogRead.sharedo and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/clusterLogRead.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.so b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.so
deleted file mode 100755 (executable)
index 581bfb5..0000000
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.so and /dev/null differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/.Depend b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/.Depend
index 5396ec8..bd02b0b 100644 (file)
--- a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/.Depend
+++ b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/.Depend
@@ -7,26 +7,27 @@ clusterLogAnalysis.o: clusterLogAnalysis.c /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/math.h \
  /usr/include/bits/huge_val.h /usr/include/bits/huge_valf.h \
  /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h /usr/include/values.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/float.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
  /home/people/tacyas/Eos/include/Memory.h /usr/include/stdlib.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/sys/types.h \
+ /usr/include/time.h /usr/include/sys/select.h /usr/include/bits/select.h \
  /usr/include/bits/sigset.h /usr/include/bits/time.h \
  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
  /usr/include/alloca.h /home/people/tacyas/Eos/include/Vector.h \
@@ -35,20 +36,21 @@ clusterLogInit.o: clusterLogInit.c /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /home/people/tacyas/Eos/include/Memory.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h /usr/include/stdlib.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/sys/types.h \
+ /usr/include/time.h /usr/include/sys/select.h /usr/include/bits/select.h \
  /usr/include/bits/sigset.h /usr/include/bits/time.h \
  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
  /usr/include/alloca.h ../inc/Cluster.h
@@ -56,22 +58,21 @@ clusterLogRead.o: clusterLogRead.c /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/values.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /home/people/tacyas/Eos/include/Memory.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
- /usr/include/bits/posix2_lim.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/float.h \
- /home/people/tacyas/Eos/include/Memory.h /usr/include/stdlib.h \
- /usr/include/sys/types.h /usr/include/time.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/include/bits/posix2_lim.h /usr/include/stdlib.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/sys/types.h \
+ /usr/include/time.h /usr/include/sys/select.h /usr/include/bits/select.h \
  /usr/include/bits/sigset.h /usr/include/bits/time.h \
  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
  /usr/include/alloca.h /home/people/tacyas/Eos/include/String.h \
@@ -80,6 +81,8 @@ clusterLogRead.o: clusterLogRead.c /usr/include/stdio.h \
  /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
  /usr/include/bits/inf.h /usr/include/bits/nan.h \
  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
+ /usr/include/values.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
  /home/people/tacyas/Eos/include/mrcImage.h \
  /home/people/tacyas/Eos/include/genUtil.h \
  /home/people/tacyas/Eos/include/ctfInfo.h \
@@ -95,21 +98,22 @@ clusterLogUtil.o: clusterLogUtil.c \
  /usr/include/bits/inf.h /usr/include/bits/nan.h \
  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
  /usr/include/values.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/float.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
  /home/people/tacyas/Eos/include/Memory.h /usr/include/stdio.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/sys/select.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
  /usr/include/bits/select.h /usr/include/bits/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -118,16 +122,17 @@ clusterLogWrite.o: clusterLogWrite.c /usr/include/stdlib.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
- /usr/include/sys/types.h /usr/include/bits/types.h \
- /usr/include/bits/typesizes.h /usr/include/time.h /usr/include/endian.h \
- /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
- /usr/include/sys/select.h /usr/include/bits/select.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
+ /usr/include/bits/waitflags.h /usr/include/bits/waitstatus.h \
+ /usr/include/endian.h /usr/include/bits/endian.h \
+ /usr/include/bits/byteswap.h /usr/include/sys/types.h \
+ /usr/include/bits/types.h /usr/include/bits/typesizes.h \
+ /usr/include/time.h /usr/include/sys/select.h /usr/include/bits/select.h \
  /usr/include/bits/sigset.h /usr/include/bits/time.h \
  /usr/include/sys/sysmacros.h /usr/include/bits/pthreadtypes.h \
  /usr/include/alloca.h /usr/include/stdio.h /usr/include/libio.h \
  /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
  /usr/include/math.h /usr/include/bits/huge_val.h \
  /usr/include/bits/huge_valf.h /usr/include/bits/huge_vall.h \
@@ -135,12 +140,12 @@ clusterLogWrite.o: clusterLogWrite.c /usr/include/stdlib.h \
  /usr/include/bits/mathdef.h /usr/include/bits/mathcalls.h \
  /usr/include/string.h /usr/include/xlocale.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/float.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/Memory.h \
  /home/people/tacyas/Eos/include/mrcImage.h \

diff --git a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/Makefile b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/Makefile
index 28e9069..a429553 100755 (executable)
--- a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/Makefile
+++ b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/Makefile
@@ -22,6 +22,8 @@ $(SHAREDLIB): $(SHAREDOBJ)
        @COMPILEDOBJ=`ls $(SHAREDOBJ)` ; echo "#### Compiled Objects"; echo $${COMPILEDOBJ};  echo "################"; \
        $(SHARED) $(SHAREDLIB) $${COMPILEDOBJ} 
 
+debug: $(LIBNAMEDEBUG) $(LIBNAMECUDAGDB)
+
 $(LIBNAMEDEBUG): $(OBJDEBUG)
        @echo LIBNAME:$(LIBNAMEDEBUG)
        $(AR) rs $(LIBNAMEDEBUG) $(OBJDEBUG)

diff --git a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/clusterLogRead.sharedo b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/clusterLogRead.sharedo
index 9db58c9..6f0d32a 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/clusterLogRead.sharedo and b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/clusterLogRead.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.a b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.a
index 8a6b14b..5306e27 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.a and b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.debug.a b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.debug.a
index 6c4cfa0..2466fb7 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.debug.a and b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.debug.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.so b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.so
index c236f1b..c4f4cef 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.so and b/hostdepend/X86LINUX64/src/Objects/General/Cluster/src/X86LINUX64/libCluster.so differ

diff --git a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.c b/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.c
deleted file mode 120000 (symlink)
index 6ea5bb3..0000000
--- a/hostdepend/X86LINUX64/src/Objects/General/eosCuda/src/X86LINUX64/eosCuda.c
+++ /dev/null
@@ -1 +0,0 @@
-../eosCuda.c
\ No newline at end of file

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/.Depend b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/.Depend
index ebaefa5..7a445d4 100644 (file)
--- a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/.Depend
+++ b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/.Depend
@@ -1,14 +1,15 @@
 argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/sys/select.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
  /usr/include/bits/select.h /usr/include/bits/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -19,26 +20,27 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
  ../inc/../inc/mrcImageClusterAnalysis.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/float.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/File.h \
  /home/people/tacyas/Eos/include/Memory.h
 init.o: init.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/sys/select.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
  /usr/include/bits/select.h /usr/include/bits/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -49,12 +51,12 @@ init.o: init.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h ../inc/config.h \
  ../inc/../inc/mrcImageClusterAnalysis.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/float.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/File.h \
  /home/people/tacyas/Eos/include/Memory.h
@@ -62,14 +64,15 @@ mrcImageClusterAnalysis.o: mrcImageClusterAnalysis.c /usr/include/stdio.h \
  /usr/include/features.h /usr/include/sys/cdefs.h \
  /usr/include/bits/wordsize.h /usr/include/gnu/stubs.h \
  /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/sys/select.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
  /usr/include/bits/select.h /usr/include/bits/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -78,12 +81,12 @@ mrcImageClusterAnalysis.o: mrcImageClusterAnalysis.c /usr/include/stdio.h \
  /usr/include/bits/huge_vall.h /usr/include/bits/inf.h \
  /usr/include/bits/nan.h /usr/include/bits/mathdef.h \
  /usr/include/bits/mathcalls.h /usr/include/values.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/syslimits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/syslimits.h \
  /usr/include/limits.h /usr/include/bits/posix1_lim.h \
  /usr/include/bits/local_lim.h /usr/include/linux/limits.h \
  /usr/include/bits/posix2_lim.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/float.h ../inc/config.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/float.h ../inc/config.h \
  ../inc/../inc/mrcImageClusterAnalysis.h \
  /home/people/tacyas/Eos/include/genUtil.h \
  /home/people/tacyas/Eos/include/mrcImage.h \
@@ -107,14 +110,15 @@ mrcImageClusterAnalysis.o: mrcImageClusterAnalysis.c /usr/include/stdio.h \
 usage.o: usage.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/sys/select.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
  /usr/include/bits/select.h /usr/include/bits/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ../inc/config.h \
@@ -122,14 +126,15 @@ usage.o: usage.c /usr/include/stdio.h /usr/include/features.h \
 util.o: util.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/sys/cdefs.h /usr/include/bits/wordsize.h \
  /usr/include/gnu/stubs.h /usr/include/gnu/stubs-64.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stddef.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stddef.h \
  /usr/include/bits/types.h /usr/include/bits/typesizes.h \
  /usr/include/libio.h /usr/include/_G_config.h /usr/include/wchar.h \
- /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.7/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.h \
- /usr/include/stdlib.h /usr/include/sys/types.h /usr/include/time.h \
- /usr/include/endian.h /usr/include/bits/endian.h \
- /usr/include/bits/byteswap.h /usr/include/sys/select.h \
+ /usr/include/stdlib.h /usr/include/bits/waitflags.h \
+ /usr/include/bits/waitstatus.h /usr/include/endian.h \
+ /usr/include/bits/endian.h /usr/include/bits/byteswap.h \
+ /usr/include/sys/types.h /usr/include/time.h /usr/include/sys/select.h \
  /usr/include/bits/select.h /usr/include/bits/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ../inc/config.h \

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis
index f4d7bfd..71e85e4 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageClusterAnalysis/src/X86LINUX64/mrcImageClusterAnalysis differ

diff --git a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.so b/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.so
deleted file mode 100755 (executable)
index 9dc585e..0000000
Binary files a/hostdepend/X86LINUX64ICC/src/Objects/DataManip/mrcImage/src/X86LINUX64ICC/libmrcImage.so and /dev/null differ

diff --git a/hostdepend/X86LINUX64ICC/src/Objects/General/eosCuda/src/X86LINUX64ICC/eosCuda.c b/hostdepend/X86LINUX64ICC/src/Objects/General/eosCuda/src/X86LINUX64ICC/eosCuda.c
deleted file mode 120000 (symlink)
index 6ea5bb3..0000000
--- a/hostdepend/X86LINUX64ICC/src/Objects/General/eosCuda/src/X86LINUX64ICC/eosCuda.c
+++ /dev/null
@@ -1 +0,0 @@
-../eosCuda.c
\ No newline at end of file

diff --git a/src/Objects/General/Cluster/src/clusterLogRead.c b/src/Objects/General/Cluster/src/clusterLogRead.c
index 23b7ab4..aefc2a4 100755 (executable)
--- a/src/Objects/General/Cluster/src/clusterLogRead.c
+++ b/src/Objects/General/Cluster/src/clusterLogRead.c
@@ -10,8 +10,9 @@
 */
 /* $Log$ */
 #include <stdio.h>
+/*
 #include <values.h>
-
+*/
 #include "Memory.h"
 #include "String.h"
 #include "../inc/Cluster.h"

diff --git a/src/Objects/General/eosCuda/src/eosCuda.c b/src/Objects/General/eosCuda/src/eosCuda.c
deleted file mode 100644 (file)
index 897b9e0..0000000
--- a/src/Objects/General/eosCuda/src/eosCuda.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-# %M% %Y% %I%
-# The latest update : %G% at %U%
-#
-#%Z% eosCuda ver %I%
-#%Z% Created by 
-#%Z%
-#%Z% Usage : eosCuda 
-#%Z% Attention
-#%Z%
-*/
-static char __sccs_id[] = "%Z%eosCuda ver%I%; Date:%D% %Z%";
-
-#include "../inc/eosCuda.h"
-
-int __eosCuda__=0;

diff --git a/src/Objects/Makefile.org b/src/Objects/Makefile.org
deleted file mode 100644 (file)
index ad84110..0000000
--- a/src/Objects/Makefile.org
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc

diff --git a/src/Tools/Makefile.orig b/src/Tools/Makefile.orig
deleted file mode 100755 (executable)
index ad84110..0000000
--- a/src/Tools/Makefile.orig
+++ /dev/null
@@ -1,5 +0,0 @@
-include ../Config/Define.inc
-include Config/Define.inc
-include .Source
-
-include Config/Target.inc

diff --git a/src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.html b/src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.html
index 062c929..00f921a 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.html
+++ b/src/Tools/mrcImage/mrcImageClusterAnalysis/src/mrcImageClusterAnalysis.html
@@ -1 +1,39 @@
-/bin/bash: mrcImageClusterAnalysis: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>mrcImageClusterAnalysis</TITLE>
+</HEAD>
+<BODY>
+<H1>mrcImageClusterAnalysis</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: mrcImageClusterAnalysis
+Options:
+    [-I[nput array of file]In                  (NULL      )] :Essential :InputDataFiles
+    [-o[utput]           Out                 (stdout    )] :Optional  :OutputDataFile
+    [-O[utput]           ] :Optional  :Output: averaged images: filename is xxxx.avg: xxxx is input filename.
+    [-N[umberOfClusters] N                   (1         )] :Optional  :Number of clusters
+    [-Min[imumCorrelation]Min                 (0.0       )] :Optional  :Minimum: Correlation: Conditions for ending
+    [-Iter[ation]        ] :Optional  :IterationFlag
+    [-A[uto]R[otation]   AutoRotation        (72        )] :Optional  :AutoRotation: rotation divided by this value
+    [-A[utoRot]Range     ARMin               (0         )ARMax               (360       )] :Optional  :AutoRotationRange
+    [-A[uto]R[otation]iter[ation]AutoRotationIteration(2         )] :Optional  :AutoRotationIteration
+    [-A[uto]R[otation]MethodAutoRotationMethod  (0         )] :Optional  :Method for Correlation for Auto Rotation
+    [-M[odeForCorrelation]correlationMode     (19        )] :Optional  :Correlation Mode for AutoRotation
+    [-pvm                ] :Optional  :Parallel Analysis by PVM
+    [-pvmList            pvmList             (NULL      )] :Optional  :pvmList: Input
+    [-Log                Log                 (stdout    )] :Optional  :Log: Output
+    [-Log2               Log2                (NULL      )] :Optional  :Log2: Output: ClusterNode Only
+    [-LogIn              LogIn               (NULL      )] :Optional  :previousLog: Input
+    [-prevF[ileNum]      prevFileNum         (0         )] :Optional  :previousLogFileNum: Input
+    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (2         )] :Optional  :Mode
+----- Additional Usage -----
+Distance between clusters: mode
+       mode 0: By Correlation
+       mode 1: By Euclid Distance
+       mode 2: By Ward Method (default) : Euclid Length (no rotation) or its square (rotation)
+       mode 3: By Ward Method using Linear Correlation : (1 - Correlation)/(1 + Correlation)
+       mode 4: By Linear Correlation :                   (1 - Correlation)/(1 + Correlation)
+</PRE>
+</BODY>
+</HTML>