modified: mrcImageTfunction

	modified:   src/Objects/DataManip/mrcImage/src/lmrcImageTfunction.c

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageTfunction b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageTfunction
index cfd8ae4..bb8087b 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageTfunction and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageTfunction differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libEosObjects.a
index 76ccac9..b1b7c2b 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 e5e93b4..f09f14f 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/libmrcImage.a b/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a
index 32d2e98..400f2ed 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a and b/hostdepend/X86LINUX64/lib/X86LINUX64/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageTfunction.sharedo b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageTfunction.sharedo
index 5888115..9f8ea8e 100644 (file)
Binary files a/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageTfunction.sharedo and b/hostdepend/X86LINUX64/lib/X86LINUX64/shared/lmrcImageTfunction.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a
index 32d2e98..400f2ed 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a
index 862e38a..74da8d5 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/libmrcImage.debug.a differ

diff --git a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageTfunction.sharedo b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageTfunction.sharedo
index 5888115..9f8ea8e 100644 (file)
Binary files a/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageTfunction.sharedo and b/hostdepend/X86LINUX64/src/Objects/DataManip/mrcImage/src/X86LINUX64/lmrcImageTfunction.sharedo differ

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageTfunction/src/X86LINUX64/.Depend b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageTfunction/src/X86LINUX64/.Depend
index dc534b4..18a04de 100644 (file)
--- a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageTfunction/src/X86LINUX64/.Depend
+++ b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageTfunction/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/mrcImageTfunction.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/mrcImageTfunction.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 @@ mrcImageTfunction.o: mrcImageTfunction.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 \
@@ -81,12 +84,12 @@ mrcImageTfunction.o: mrcImageTfunction.c /usr/include/stdio.h \
  ../inc/../inc/mrcImageTfunction.h \
  /home/people/tacyas/Eos/include/mrcImage.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/ctfInfo.h \
  /home/people/tacyas/Eos/include/Vector.h \
  /home/people/tacyas/Eos/include/Matrix3D.h \
@@ -94,14 +97,15 @@ mrcImageTfunction.o: mrcImageTfunction.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 \
@@ -109,14 +113,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/mrcImageTfunction/src/X86LINUX64/mrcImageTfunction b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageTfunction/src/X86LINUX64/mrcImageTfunction
index cfd8ae4..bb8087b 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageTfunction/src/X86LINUX64/mrcImageTfunction and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageTfunction/src/X86LINUX64/mrcImageTfunction differ

diff --git a/src/Objects/DataManip/mrcImage/src/lmrcImageTfunction.c b/src/Objects/DataManip/mrcImage/src/lmrcImageTfunction.c
index d7b7630..0156c19 100755 (executable)
--- a/src/Objects/DataManip/mrcImage/src/lmrcImageTfunction.c
+++ b/src/Objects/DataManip/mrcImage/src/lmrcImageTfunction.c
@@ -134,7 +134,8 @@ StatData getStatDataOfWhole(mrcImage* src, AxisInfo *x, AxisInfo *y, AxisInfo *z
 {
        StatData ret;
        mrcImageInformation info;
-       
+
+       info.mode = meanOfAll; 
        lmrcImageInformation(&info, src);
        ret.n = src->HeaderN.x * src->HeaderN.y * src->HeaderN.z;
        ret.mean = info.mean;