modified: Makefile

	modified:   mrcImageNoiseReductionByRelaxation
	modified:   src/Tools/Config/Define.inc

diff --git a/Makefile b/Makefile
index 3d0d132..f17bec6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -17,7 +17,7 @@ help::
        @echo "---- To fetch and merge new/modified source codes. ----" 
        @echo " $$ make git-fetch       or git-fetch[-all|-data|-tutorial|-optional|-others]" 
        @echo " $$ make git-merge       or git-merge[-all|-data|-tutorial|-optional|-others]" 
-       @echo ""
+       @echo " $$ make setting"
        @echo "---- To init git repository ----"
        @echo " $$ make git-init        or git-init[-all|-data|-tutorial|-optional|-others]" 
        @echo ""
@@ -29,10 +29,20 @@ help::
        @echo "     [-others] : other source codes for utils"
        @echo "     [-all] : all"
        @echo ""
+       @echo ">>>> Setting"
+       @echo "----------------"
+       @echo "---- To set Eos ----"
+       @echo " $$ make setting"
+       @echo " $$ make rebuild"
+       @echo ""
        @echo ">>>> Rebuild"
        @echo "----------------"
        @echo "---- To rebuild source codes of Eos ----"
        @echo " $$ make rebuild"
+       @echo ""
+       @echo "---- To relink Eos ----"
+       @echo " $$ make relink"
+
 
 
 rebuild: rebuild-Objects rebuild-Tools
@@ -43,6 +53,13 @@ rebuild-Objects:
 rebuild-Tools:
        cd src/Tools;    make check; make depend; make ; make install
 
+setting:relink
+
+relink:
+       ln -s optional/doc .
+       ln -s optional/objects .
+       ln -s data/example .
+
 git-add-all:: git-add git-add-data git-add-optional git-add-tutorial git-add-others
 
 git-add::
@@ -104,7 +121,7 @@ git-push-tutorial::
        cd tutorial; git push tutorial master --tags 
 
 git-push-others::
-       cd others; git push tutorial master --tags
+       cd others; git push others master --tags
 
 git-fetch-all:: git-fetch git-fetch-data git-fetch-optional git-fetch-tutorial git-fetch-others
 
@@ -167,3 +184,5 @@ git-init-others::
        if [ ! -d others ] ; then mkdir others; fi
        cd others ; git remote add others $${EOS_GIT_USER}@$(EOS_GIT_REPOSITRY_OTHERS)
 
+
+

diff --git a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNoiseReductionByRelaxation b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNoiseReductionByRelaxation
index 8c1f8c2..3c482ee 100755 (executable)
Binary files a/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNoiseReductionByRelaxation and b/hostdepend/X86LINUX64/bin/X86LINUX64/mrcImageNoiseReductionByRelaxation differ

diff --git a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/X86LINUX64/.Depend b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/X86LINUX64/.Depend
index 594aa10..21cf078 100644 (file)
--- a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/X86LINUX64/.Depend
+++ b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/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.6/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.6/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/mrcImageNoiseReductionByRelaxation.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.6/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.6/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.6/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.6/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.6/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/mrcImageNoiseReductionByRelaxation.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.6/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.6/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.6/include/float.h \
  /home/people/tacyas/Eos/include/String.h \
  /home/people/tacyas/Eos/include/File.h \
  /home/people/tacyas/Eos/include/Memory.h
@@ -63,14 +65,15 @@ mrcImageNoiseReductionByRelaxation.o: \
  /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.6/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.6/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,14 +84,14 @@ mrcImageNoiseReductionByRelaxation.o: \
  /usr/include/bits/mathcalls.h ../inc/config.h \
  ../inc/../inc/mrcImageNoiseReductionByRelaxation.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.6/include/limits.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.6/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 \
  /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/float.h \
+ /usr/lib/gcc/x86_64-redhat-linux/4.4.6/include/float.h \
  /home/people/tacyas/Eos/include/ctfInfo.h \
  /home/people/tacyas/Eos/include/Vector.h \
  /home/people/tacyas/Eos/include/Matrix3D.h \
@@ -113,14 +116,15 @@ mrcImageNoiseReductionByRelaxation.o: \
 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.6/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.6/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 \
@@ -128,14 +132,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.6/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.6/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/mrcImageNoiseReductionByRelaxation/src/X86LINUX64/mrcImageNoiseReductionByRelaxation b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/X86LINUX64/mrcImageNoiseReductionByRelaxation
index 8c1f8c2..3c482ee 100755 (executable)
Binary files a/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/X86LINUX64/mrcImageNoiseReductionByRelaxation and b/hostdepend/X86LINUX64/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/X86LINUX64/mrcImageNoiseReductionByRelaxation differ

diff --git a/src/Tools/Config/Define.inc b/src/Tools/Config/Define.inc
index 7449e77..1dd81fb 100755 (executable)
--- a/src/Tools/Config/Define.inc
+++ b/src/Tools/Config/Define.inc
@@ -50,3 +50,6 @@ WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
 WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools
+WORLDNAME=Tools

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Config/OptionControlFile b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Config/OptionControlFile
index 00910c9..15b97d9 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Config/OptionControlFile
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Config/OptionControlFile
@@ -1,13 +1,14 @@
 # OptionControlFile
 # FileFormat
-"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
 "-i","-i[nput]","InputDataFile","Essential","1","1","In","inFile","NULL"
 "-o","-o[utput]","OutputDataFile","Essential","1","1","Out","outFile","NULL"
 "-n","-n[umber]","Number of Density Level","Optional","1","1","Nlab","Integer","8"
-"-max","-max[imum]","Maximum of Density Level","Optional","1","1","max","Integer","NULL"
-"-min","-min[imum]","Minimum of Density Level","Optional","1","1","min","Integer","NULL"
-"-m1","-m[ode1]","Dij Modeof Personal Style","Optional","1","1","mode1","Integer","1"
-"-m2","-m[ode2]","Dij Mode of Figure Style","Optional","1","1","mode2","Integer","1"
-"-m3","-m[ode3]","Dij Mode of Dimension Style","Optional","1","1","mode3","Integer","1"
-"-om","-o[ptionalmode]","Optional Mode of Noise Reduction","Optional","1","1","mode","Integer","0"
-"-t","-t[imes]","Times of NoiseReduction","Optional","1","1","times","Integer","1"
\ No newline at end of file
+"-max","-max[imum]","Maximum of Density Level","Optional","1","1","max","Integer","0"
+"-min","-min[imum]","Minimum of Density Level","Optional","1","1","min","Integer","0"
+"-m1","-m[ode]1","Dij Modeof Personal Style","Optional","1","1","mode1","Integer","1"
+"-m2","-m[ode]2","Dij Mode of Figure Style","Optional","1","1","mode2","Integer","1"
+"-m3","-m[ode]3","Dij Mode of Dimension Style","Optional","1","1","mode3","Integer","1"
+"-om","-o[ptional]m[ode]","Optional Mode of Noise Reduction","Optional","1","1","omode","Integer","0"
+"-t","-t[imes]","Times of NoiseReduction","Optional","1","1","times","Integer","1"
+"-c","-c[onfig]","ConfigurationFile","Optional","1","1","configFile","inFile","NULL"
+"-m","-m[ode]","mode","Optional","1","1","mode","Integer","0"

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Makefile b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Makefile
deleted file mode 100755 (executable)
index cf583bda5caf22ea6b484fd2f57d17c251220e08..0000000000000000000000000000000000000000
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Makefile
+++ /dev/null
@@ -1,103 +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 src/$(OSTYPE) ]; then \
-               echo making directory; \
-               mkdir src/$(OSTYPE); \
-       fi
-       @$(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/mrcImageNoiseReductionByRelaxation/Makefile b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Makefile
new file mode 120000 (symlink)
index 0000000000000000000000000000000000000000..537735e6f10200cd5c886af6775498a31bbc041e
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/Makefile
@@ -0,0 +1 @@
+/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/Makefile
\ No newline at end of file

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/doc/Makefile b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/doc/Makefile
new file mode 120000 (symlink)
index 0000000..e35804f
--- /dev/null
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/doc/Makefile
@@ -0,0 +1 @@
+/home/people/tacyas/Eos/src/Config/Template/ToolsTemplate.Dir/doc/Makefile
\ No newline at end of file

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/inc/mrcImageNoiseReductionByRelaxation.h b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/inc/mrcImageNoiseReductionByRelaxation.h
index 888ade9..a22b2de 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/inc/mrcImageNoiseReductionByRelaxation.h
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/inc/mrcImageNoiseReductionByRelaxation.h
@@ -13,10 +13,6 @@
 typedef struct mrcImageNoiseReductionByRelaxationInfo {
     long flagRedirect;
 
-    long flagconfigFile;
-    char* configFile;
-    FILE* fptconfigFile;
-    
     long flagIn;
     char* In;
     FILE* fptIn;
@@ -43,12 +39,19 @@ typedef struct mrcImageNoiseReductionByRelaxationInfo {
     long flagmode3;
     long mode3;
     
-    long flagmode;
-    long mode;
+    long flagomode;
+    long omode;
     
     long flagtimes;
     long times;
     
+    long flagconfigFile;
+    char* configFile;
+    FILE* fptconfigFile;
+    
+    long flagmode;
+    long mode;
+    
 } mrcImageNoiseReductionByRelaxationInfo;
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/Makefile b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/Makefile
index 82ced53..a547c12 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/Makefile
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/Makefile
@@ -70,19 +70,19 @@ cudagdb: $(OSTYPE)/$(OBJECTNAME).cudagdb
 
 
 $(OSTYPE)/$(OBJECTNAME)::
-       $(RM) -f $(OSTYPE)/Makefile ; \
+       @$(RM) -f $(OSTYPE)/Makefile ; \
        $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
        $(MAKE) $(OBJECTNAME)  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
 
 $(OSTYPE)/$(OBJECTNAME).debug::
-       $(RM) -f Makefile ; \
+       @$(RM) -f Makefile ; \
        $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
        $(MAKE) $(OBJECTNAME).debug  WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)
 
 $(OSTYPE)/$(OBJECTNAME).cudagdb::
-       $(RM) -f Makefile ; \
+       @$(RM) -f Makefile ; \
        $(CP) $(EOS_HOME)/src/Config/Template/$(WORLDNAME)Template.Dir/src/ARCH/Makefile $(OSTYPE)/Makefile ; \
        cd $(OSTYPE); \
        $(MAKE) $(OBJECTNAME).cudagdb WORLDNAME=$(WORLDNAME) CLASSNAME=$(CLASSNAME) OBJECTNAME=$(OBJECTNAME)

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/argCheck.c b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/argCheck.c
index 4f25d6e..88afc91 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/argCheck.c
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/argCheck.c
@@ -14,20 +14,20 @@ argCheck(mrcImageNoiseReductionByRelaxationInfo* info, int argc, char* argv[])
 {
     long i, j, nv;
     char s[1024];
+    FILE* fpt;
+    
+    if(NULL==(fpt=fopen(".EosLog", "a+"))) { 
+        
+    } else {
+        for(i=0; i<argc; i++) {
+            fprintf(fpt, "%s ", argv[i]);
+        }
+        fprintf(fpt, "\n");
+        fclose(fpt);
+    }
     for(i=1; i<argc; i++) {
         if(OPTION_FLAG==argv[i][OPTION_FLAG_POS]) {
             SSWITCH(argv[i]+OPTION_POS)
-                SCASE("c") {
-                    if(i+1<argc) {
-                        info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
-                        i++;
-                        info->flagconfigFile++;
-                    } else {
-                        usage(argv[0]);
-                        exit(EXIT_FAILURE);
-                    }
-                    SBREAK;
-                }
                 SCASE("i") {
                     if(i+1<argc) {
                         info->In = stringGetNthWord(argv[i+1], 1, " ,");
@@ -118,9 +118,9 @@ argCheck(mrcImageNoiseReductionByRelaxationInfo* info, int argc, char* argv[])
                 }
                 SCASE("om") {
                     if(i+1<argc) {
-                        info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        info->omode = stringGetNthIntegerData(argv[i+1], 1, " ,");
                         i++;
-                        info->flagmode++;
+                        info->flagomode++;
                     } else {
                         usage(argv[0]);
                         exit(EXIT_FAILURE);
@@ -138,6 +138,28 @@ argCheck(mrcImageNoiseReductionByRelaxationInfo* info, int argc, char* argv[])
                     }
                     SBREAK;
                 }
+                SCASE("c") {
+                    if(i+1<argc) {
+                        info->configFile = stringGetNthWord(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagconfigFile++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
+                SCASE("m") {
+                    if(i+1<argc) {
+                        info->mode = stringGetNthIntegerData(argv[i+1], 1, " ,");
+                        i++;
+                        info->flagmode++;
+                    } else {
+                        usage(argv[0]);
+                        exit(EXIT_FAILURE);
+                    }
+                    SBREAK;
+                }
                 SCASE("h") {
                     usage(argv[0]);
                     exit(EXIT_SUCCESS);

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/init.c b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/init.c
index 799ffd6..ac691aa 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/init.c
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/init.c
@@ -12,17 +12,18 @@
 void
 init0(mrcImageNoiseReductionByRelaxationInfo* info)
 {
-    info->fptconfigFile = NULL;    info->flagconfigFile = 0;
     info->fptIn = NULL;    info->flagIn = 0;
     info->fptOut = NULL;    info->flagOut = 0;
     info->Nlab = 8;    info->flagNlab = 0;
-    info->max = NULL;    info->flagmax = 0;
-    info->min = NULL;    info->flagmin = 0;
+    info->max = 0;    info->flagmax = 0;
+    info->min = 0;    info->flagmin = 0;
     info->mode1 = 1;    info->flagmode1 = 0;
     info->mode2 = 1;    info->flagmode2 = 0;
     info->mode3 = 1;    info->flagmode3 = 0;
-    info->mode = 0;    info->flagmode = 0;
+    info->omode = 0;    info->flagomode = 0;
     info->times = 1;    info->flagtimes = 0;
+    info->fptconfigFile = NULL;    info->flagconfigFile = 0;
+    info->mode = 0;    info->flagmode = 0;
 }
 
 void
@@ -30,13 +31,9 @@ init1(mrcImageNoiseReductionByRelaxationInfo* info)
 {
     char s[1024];
     int i;
-    if(info->flagconfigFile) {
-        info->fptconfigFile = fileOpen(info->configFile, "r");
-    }
-    
     if(!info->flagIn) {
         stringGetFromFile(s, "In", stdin, stdout, 0);
-        info->In = stringGetNthWord(s, 1, " ,");
+        info->In = stringGetNthWord(s, 1, " ,\t");
         info->flagIn++;
     }
     if(info->flagIn) {
@@ -45,7 +42,7 @@ init1(mrcImageNoiseReductionByRelaxationInfo* info)
     
     if(!info->flagOut) {
         stringGetFromFile(s, "Out", stdin, stdout, 0);
-        info->Out = stringGetNthWord(s, 1, " ,");
+        info->Out = stringGetNthWord(s, 1, " ,\t");
         info->flagOut++;
     }
     if(info->flagOut) {
@@ -70,12 +67,19 @@ init1(mrcImageNoiseReductionByRelaxationInfo* info)
     if(info->flagmode3) {
     }
     
-    if(info->flagmode) {
+    if(info->flagomode) {
     }
     
     if(info->flagtimes) {
     }
     
+    if(info->flagconfigFile) {
+        info->fptconfigFile = fileOpen(info->configFile, "r");
+    }
+    
+    if(info->flagmode) {
+    }
+    
 }
 #ifdef KHOROS
 #include <stdio.h>

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.c b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.c
index 165fa24..2cb8d1c 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.c
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.c
@@ -64,8 +64,8 @@ main(int argc, char* argv[])
   mrcFileRead(&in, info.In, "in main", 0);
   
   /* Get Maximum and Minimum */
-  fprintf(stdout," This is Noise Reduction by Relaxation Ver 4.0 .\n");
-  fprintf(stdout," ---All right are reserved in the Univ. of Tokyo, only.---\n");
+  //fprintf(stdout," This is Noise Reduction by Relaxation Ver 4.0 .\n");
+  //fprintf(stdout," ---All right are reserved in the Univ. of Tokyo, only.---\n");
   lmrcImageDataMaxAndMinGetByImage(&in, &datamax, &datamin);
   linfo.datamax = datamax;
   linfo.datamin = datamin;
@@ -164,9 +164,9 @@ main(int argc, char* argv[])
       }
     }
   }
-  fprintf(stdout," -------(^_^)------ Noise Reduction Ver 4.0\n");
-  fprintf(stdout," Composed, Written, Arranged by Tomochan (Tomoki Inoue).\n");
-  fprintf(stdout," Thank you, ByeBye !!\n");
+  //fprintf(stdout," -------(^_^)------ Noise Reduction Ver 4.0\n");
+  //fprintf(stdout," Composed, Written, Arranged by Tomochan (Tomoki Inoue).\n");
+  //fprintf(stdout," Thank you, ByeBye !!\n");
   exit(EXIT_SUCCESS);
 }
 

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.html b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.html
index 0cf89e4..846d3ca 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.html
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.html
@@ -8,17 +8,18 @@
 <PRE>
 Usage: mrcImageNoiseReductionByRelaxation
 Options:
-    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
     [-i[nput]            In                  (NULL      )] :Essential :InputDataFile
     [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile
     [-n[umber]           Nlab                (8         )] :Optional  :Number of Density Level
-    [-max[imum]          max                 (NULL      )] :Optional  :Maximum of Density Level
-    [-min[imum]          min                 (NULL      )] :Optional  :Minimum of Density Level
-    [-m[ode1]            mode1               (1         )] :Optional  :Dij Modeof Personal Style
-    [-m[ode2]            mode2               (1         )] :Optional  :Dij Mode of Figure Style
-    [-m[ode3]            mode3               (1         )] :Optional  :Dij Mode of Dimension Style
-    [-o[ptionalmode]     mode                (0         )] :Optional  :Optional Mode of Noise Reduction
+    [-max[imum]          max                 (0         )] :Optional  :Maximum of Density Level
+    [-min[imum]          min                 (0         )] :Optional  :Minimum of Density Level
+    [-m[ode]1            mode1               (1         )] :Optional  :Dij Modeof Personal Style
+    [-m[ode]2            mode2               (1         )] :Optional  :Dij Mode of Figure Style
+    [-m[ode]3            mode3               (1         )] :Optional  :Dij Mode of Dimension Style
+    [-o[ptional]m[ode]   omode               (0         )] :Optional  :Optional Mode of Noise Reduction
     [-t[imes]            times               (1         )] :Optional  :Times of NoiseReduction
+    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile
+    [-m[ode]             mode                (0         )] :Optional  :mode
 </PRE>
 </BODY>
 </HTML>

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.pane b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.pane
index 2831bc5..afaee0c 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.pane
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/mrcImageNoiseReductionByRelaxation.pane
@@ -4,20 +4,21 @@
       -D 1 0 9x1+0+0 'Options' _gui_options
         -H 1  6x1+0+0 'License' 'license' $BOOTSTRAP/repos/license/License license
         -E
-        -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOSBIN/mrcImageNoiseReductionByRelaxation
+        -R 1 0 1 5x1+35+0 'Run' 'execute operation' $EOS/bin/mrcImageNoiseReductionByRelaxation
         -H 1  5x1+41+0 'Help' 'help page' $EOS/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/doc/mrcImageNoiseReductionByRelaxation.doc help
         -Q 1 0 5.25x1+47+0 'Close'
-        -I 1 0 1 0 0 1 -1x1+1+1.500000 ' ' 'configFile' 'ConfigurationFile' c
-        -I 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'In' 'InputDataFile' i
-        -O 1 0 1 1 0 1 -1x1+1+4.500000 ' ' 'Out' 'OutputDataFile' o
-        -i 1 0 1 0 0 -1x1+1+6.000000 0 0 8 0 0 'Nlab' 'Number of Density Level' n
-        -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'max' 'Maximum of Density Level' max
-        -i 1 0 1 0 0 -1x1+1+9.000000 0 0 0 0 0 'min' 'Minimum of Density Level' min
-        -i 1 0 1 0 0 -1x1+1+10.500000 0 0 1 0 0 'mode1' 'Dij Modeof Personal Style' m1
-        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 1 0 0 'mode2' 'Dij Mode of Figure Style' m2
-        -i 1 0 1 0 0 -1x1+1+13.500000 0 0 1 0 0 'mode3' 'Dij Mode of Dimension Style' m3
-        -i 1 0 1 0 0 -1x1+1+15.000000 0 0 0 0 0 'mode' 'Optional Mode of Noise Reduction' om
-        -i 1 0 1 0 0 -1x1+1+16.500000 0 0 1 0 0 'times' 'Times of NoiseReduction' t
+        -I 1 0 1 1 0 1 -1x1+1+1.500000 ' ' 'In' 'InputDataFile' i
+        -O 1 0 1 1 0 1 -1x1+1+3.000000 ' ' 'Out' 'OutputDataFile' o
+        -i 1 0 1 0 0 -1x1+1+4.500000 0 0 8 0 0 'Nlab' 'Number of Density Level' n
+        -i 1 0 1 0 0 -1x1+1+6.000000 0 0 0 0 0 'max' 'Maximum of Density Level' max
+        -i 1 0 1 0 0 -1x1+1+7.500000 0 0 0 0 0 'min' 'Minimum of Density Level' min
+        -i 1 0 1 0 0 -1x1+1+9.000000 0 0 1 0 0 'mode1' 'Dij Modeof Personal Style' m1
+        -i 1 0 1 0 0 -1x1+1+10.500000 0 0 1 0 0 'mode2' 'Dij Mode of Figure Style' m2
+        -i 1 0 1 0 0 -1x1+1+12.000000 0 0 1 0 0 'mode3' 'Dij Mode of Dimension Style' m3
+        -i 1 0 1 0 0 -1x1+1+13.500000 0 0 0 0 0 'omode' 'Optional Mode of Noise Reduction' om
+        -i 1 0 1 0 0 -1x1+1+15.000000 0 0 1 0 0 'times' 'Times of NoiseReduction' t
+        -I 1 0 1 0 0 1 -1x1+1+16.500000 ' ' 'configFile' 'ConfigurationFile' c
+        -i 1 0 1 0 0 -1x1+1+18.000000 0 0 0 0 0 'mode' 'mode' m
     -E
   -E
 -E

diff --git a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/usage.c b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/usage.c
index 8d88880..5253669 100755 (executable)
--- a/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/usage.c
+++ b/src/Tools/mrcImage/mrcImageNoiseReductionByRelaxation/src/usage.c
@@ -7,17 +7,18 @@ usage(char* thisProgram)
 {
     fprintf(stderr, "Usage: %s\n", thisProgram);
     fprintf(stderr, "Options:\n");
-    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
     fprintf(stderr, "    [-i[nput]            In                  (NULL      )] :Essential :InputDataFile\n");
     fprintf(stderr, "    [-o[utput]           Out                 (NULL      )] :Essential :OutputDataFile\n");
     fprintf(stderr, "    [-n[umber]           Nlab                (8         )] :Optional  :Number of Density Level\n");
-    fprintf(stderr, "    [-max[imum]          max                 (NULL      )] :Optional  :Maximum of Density Level\n");
-    fprintf(stderr, "    [-min[imum]          min                 (NULL      )] :Optional  :Minimum of Density Level\n");
-    fprintf(stderr, "    [-m[ode1]            mode1               (1         )] :Optional  :Dij Modeof Personal Style\n");
-    fprintf(stderr, "    [-m[ode2]            mode2               (1         )] :Optional  :Dij Mode of Figure Style\n");
-    fprintf(stderr, "    [-m[ode3]            mode3               (1         )] :Optional  :Dij Mode of Dimension Style\n");
-    fprintf(stderr, "    [-o[ptionalmode]     mode                (0         )] :Optional  :Optional Mode of Noise Reduction\n");
+    fprintf(stderr, "    [-max[imum]          max                 (0         )] :Optional  :Maximum of Density Level\n");
+    fprintf(stderr, "    [-min[imum]          min                 (0         )] :Optional  :Minimum of Density Level\n");
+    fprintf(stderr, "    [-m[ode]1            mode1               (1         )] :Optional  :Dij Modeof Personal Style\n");
+    fprintf(stderr, "    [-m[ode]2            mode2               (1         )] :Optional  :Dij Mode of Figure Style\n");
+    fprintf(stderr, "    [-m[ode]3            mode3               (1         )] :Optional  :Dij Mode of Dimension Style\n");
+    fprintf(stderr, "    [-o[ptional]m[ode]   omode               (0         )] :Optional  :Optional Mode of Noise Reduction\n");
     fprintf(stderr, "    [-t[imes]            times               (1         )] :Optional  :Times of NoiseReduction\n");
+    fprintf(stderr, "    [-c[onfig]           configFile          (NULL      )] :Optional  :ConfigurationFile\n");
+    fprintf(stderr, "    [-m[ode]             mode                (0         )] :Optional  :mode\n");
     additionalUsage();
 }