OSDN Git Service

Recompiling ctfDisplay and Display2
authorTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 5 Jul 2013 18:15:10 +0000 (03:15 +0900)
committerTakuo Yasunaga <yasunaga@bio.kyutech.ac.jp>
Fri, 5 Jul 2013 18:15:10 +0000 (03:15 +0900)
hostdepend/X86LINUX64/bin/X86LINUX64/Display2
hostdepend/X86LINUX64/bin/X86LINUX64/ctfDisplay
hostdepend/X86LINUX64/src/Tools/Integration/Display2/src/X86LINUX64/.Depend
hostdepend/X86LINUX64/src/Tools/Integration/Display2/src/X86LINUX64/Display2
hostdepend/X86LINUX64/src/Tools/Integration/ctfDisplay/src/X86LINUX64/.Depend
hostdepend/X86LINUX64/src/Tools/Integration/ctfDisplay/src/X86LINUX64/ctfDisplay
src/Tools/Integration/Display2/src/Display2.html
src/Tools/Integration/ctfDisplay/src/ctfDisplay.html

index 6d45f07..4cbf2b0 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/Display2 and b/hostdepend/X86LINUX64/bin/X86LINUX64/Display2 differ
index 777147e..28fee9a 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/ctfDisplay and b/hostdepend/X86LINUX64/bin/X86LINUX64/ctfDisplay differ
index d9fbfe5..eb27c99 100644 (file)
@@ -4,12 +4,11 @@ Display2.o: Display2.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -20,7 +19,7 @@ Display2.o: Display2.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/tcl.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/limits.h \
- /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/limits.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/tclDecls.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/tclPlatDecls.h \
  /home/people/tacyas/Eos/include/mrcImage.h \
@@ -51,12 +50,11 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -67,7 +65,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h ../inc/config.h ../inc/../inc/Display2.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/limits.h \
- /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/limits.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/File.h \
@@ -78,12 +76,11 @@ init.o: init.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -94,7 +91,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h ../inc/config.h ../inc/../inc/Display2.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/limits.h \
- /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/limits.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/File.h \
@@ -105,12 +102,11 @@ usage.o: usage.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ../inc/config.h \
@@ -121,12 +117,11 @@ util.o: util.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ../inc/config.h \
index 6d45f07..4cbf2b0 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/Integration/Display2/src/X86LINUX64/Display2 and b/hostdepend/X86LINUX64/src/Tools/Integration/Display2/src/X86LINUX64/Display2 differ
index 9a8e53f..efb3ee3 100644 (file)
@@ -4,12 +4,11 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -20,7 +19,7 @@ argCheck.o: argCheck.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h ../inc/config.h ../inc/../inc/ctfDisplay.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/limits.h \
- /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/limits.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/File.h \
@@ -31,12 +30,11 @@ ctfDisplay.o: ctfDisplay.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -47,7 +45,7 @@ ctfDisplay.o: ctfDisplay.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h ../inc/config.h ../inc/../inc/ctfDisplay.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/limits.h \
- /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/limits.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/float.h \
  /home/people/tacyas/Eos/include/mrcImage.h \
  /home/people/tacyas/Eos/include/genUtil.h \
@@ -79,12 +77,11 @@ init.o: init.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h \
@@ -95,7 +92,7 @@ init.o: init.c /usr/include/stdio.h /usr/include/features.h \
  /usr/include/bits/mathcalls.h ../inc/config.h ../inc/../inc/ctfDisplay.h \
  /home/people/tacyas/Eos/include/genUtil.h /usr/include/values.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/limits.h \
- /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/limits.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include-fixed/limits.h \
  /home/people/tacyas/Eos/util/X86LINUX64/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/File.h \
@@ -106,12 +103,11 @@ usage.o: usage.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/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,12 +118,11 @@ util.o: util.c /usr/include/stdio.h /usr/include/features.h \
  /home/people/tacyas/Eos/util/X86LINUX64/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/lib/gcc/x86_64-redhat-linux/4.4.6/include/stdarg.h \
+ /usr/lib64/gcc/x86_64-suse-linux/4.4/include/stdarg.h \
  /usr/include/bits/stdio_lim.h /usr/include/bits/sys_errlist.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/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/sigset.h \
  /usr/include/bits/time.h /usr/include/sys/sysmacros.h \
  /usr/include/bits/pthreadtypes.h /usr/include/alloca.h ../inc/config.h \
index 777147e..28fee9a 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/Integration/ctfDisplay/src/X86LINUX64/ctfDisplay and b/hostdepend/X86LINUX64/src/Tools/Integration/ctfDisplay/src/X86LINUX64/ctfDisplay differ
index 4c43565..b4e11a4 100644 (file)
@@ -1 +1,28 @@
-/bin/bash: Display2: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>Display2</TITLE>
+</HEAD>
+<BODY>
+<H1>Display2</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: Display2
+Options:
+    [-i[nput]            In                  (NULL      )] :Optional  :InputDataFile
+    [-t[epmlate]         Template            (85.roi    )] :Optional  :Template for InputFile 
+    [-H[ighForThres]     ThresHigh           (0.0       )] :Optional  :Template for InputFile 
+    [-L[owForThres]      ThresLow            (0.0       )] :Optional  :Template for InputFile 
+    [-Zoom               Zoom                (1.0       )] :Optional  :Zoom for InputFile 
+    [-Inverse            ] :Optional  :Inverse (HighValue(dark)<->LowValue(bright)) for InputFile 
+    [-o[utput]           Out                 (.EosLog   )] :Optional  :OutputLogFile
+    [-display            geometry            (:0.0      )] :Optional  :OutputLogFile
+    [-geometry           display             (1024x1024+0+0)] :Optional  :OutputLogFile
+    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         )] :Optional  :Mode
+New wish commands of Display2
+mrcInfoSet [z|min|max] value
+mrcInfoSet [log|pow] 
+mrcInfoGet [Nx|Ny|Nz|Max|Min|Mean|Hist]
+</PRE>
+</BODY>
+</HTML>
index 28bd238..f1cef89 100755 (executable)
@@ -1 +1,23 @@
-/bin/bash: ctfDisplay: No such file or directory
+<HTML>
+<HEAD>
+<TITLE>ctfDisplay</TITLE>
+</HEAD>
+<BODY>
+<H1>ctfDisplay</H1>
+<H2>Usage</H2>
+<PRE>
+Usage: ctfDisplay
+Options:
+    [-i[nput]            inMRC               (NULL      )] :Optional  :Input:MRC(FFT)
+    [-o[utput]           outCTF              (stdout    )] :Optional  :Input/Output: ctfinfo
+    [-Rmax               Rmax                (0.2       )] :Optional  :Rmax [A-1] 
+    [-Imax               Imax                (0.2       )] :Optional  :Intensity: min-max
+    [-Imin               Imin                (0.02      )] :Optional  :Intensity: min-max
+    [-AutoRange          ] :Optional  :Intensity: min-max
+    [-Log                ] :Optional  :Log of Intensity
+    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         )] :Optional  :Mode
+----- Additional Usage -----
+</PRE>
+</BODY>
+</HTML>