From 388b3ef7e70e6567b60192d15dd086d944d7b8e5 Mon Sep 17 00:00:00 2001 From: kinoshita-eos Date: Fri, 17 Oct 2014 09:54:53 +0900 Subject: [PATCH] Modify: Add help message: make or make help Changes to be committed: new file: Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile renamed: Small Tools/mrcImageFourierNeighborCorrelation/Makefile.config -> Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile.config deleted: Small Tools/mrcImageFourierNeighborCorrelation/Makefile modified: TIPS/BackImage/Makefile modified: TIPS/BackImage/Makefile.config new file: TIPS/Help/Makefile.config deleted: TIPS/MaskImage/.EosLog modified: TIPS/MaskImage/Makefile modified: TIPS/MaskImage/Makefile.config modified: TIPS/NulImage/Makefile modified: TIPS/NulImage/Makefile.config --- .../Makefile/Makefile | 79 ++++++++++++++++++++++ .../Makefile}/Makefile.config | 0 .../mrcImageFourierNeighborCorrelation/Makefile | 50 -------------- TIPS/BackImage/Makefile | 4 ++ TIPS/BackImage/Makefile.config | 22 ++++++ TIPS/Help/Makefile.config | 22 ++++++ TIPS/MaskImage/.EosLog | 1 - TIPS/MaskImage/Makefile | 4 ++ TIPS/MaskImage/Makefile.config | 14 ++++ TIPS/NulImage/Makefile | 6 +- TIPS/NulImage/Makefile.config | 18 ++++- 11 files changed, 167 insertions(+), 53 deletions(-) create mode 100644 Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile rename Small Tools/{mrcImageFourierNeighborCorrelation => mrcImage/mrcImageFourierNeighborCorrelation/Makefile}/Makefile.config (100%) delete mode 100644 Small Tools/mrcImageFourierNeighborCorrelation/Makefile create mode 100644 TIPS/Help/Makefile.config delete mode 100644 TIPS/MaskImage/.EosLog diff --git a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile new file mode 100644 index 0000000..c8f377b --- /dev/null +++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile @@ -0,0 +1,79 @@ +# +# This is Main Makefile for mrcImageFourierNeighborCorrelation. +# + +#### Root Makefile #### +MAKE_ROOT=mrcImageFourierNeighborCorrelation + +#### Input extention #### +INI=mrc +MASK=mask +MASKBACK=maskback +FSC=fsc + +#### Suffixes rule #### +# Defined at Sub + +#### INCLUDE #### +-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config +-include Makefile.config + +#### Definition #### +# Path of Input File +INPUT_PATH=${EOS_HOME}/tutorial/SampleData/1VOM-N.mrc + +### FileData +FILE_NAME=Input + +### ForMask +MASK_F_MODE=4 +MASK_VALUE=0.0125 + +# MaskSize +MASK_SIZE_X=256 +MASK_SIZE_Y=256 +MASK_SIZE_Z=256 + +#### Rules of the list created #### +# Defined at Sub + +##### Commands ##### +# Defined at Sub basically +Initial:: + make InitialData; + make InputInfo; + make MaskBackImage; + make InputBackImage; + make InputMaskImage; + +all:: + make Initial; + make FSC; + +help_mrcImageFourierNeighborCorrelation:: + @echo + @echo "Makefile for mrcImageFourierNeighborCorrelation" + @echo "This is Main Makefile for mrcImageFourierNeighborCorrelation." + @echo + @echo " (Command):" + @echo " Initial: Create Initial File for execution." + @echo " (Setting Data):" + @echo " INI: input extention" + @echo " INIpad: for -i" + @echo " MASK: for -mask" + @echo " MASKBACK: for -maskBack" + @echo " FSC: Sample of execution." + @echo + @echo " (Setting Data):" + @echo " FILE_NAME: filename of input and output" + @echo " MASK_SIZE_X: size x of covering whole image" + @echo " MASK_SIZE_Y: size y of covering whole image" + @echo " MASK_SIZE_Z: size z of covering whole image" + @echo " MASK_VALUE: value of outer image" + @echo " MASK_F_MODE: low pass filter mode for mask" + +##### Commands(Input to Output) ##### +# Defined at Sub +.$(MASK).$(FSC): + mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FSC) -d 0.025 \ + -FSC -mask $*.$(MASK) -maskBack $*.$(MASKBACK); diff --git a/Small Tools/mrcImageFourierNeighborCorrelation/Makefile.config b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile.config similarity index 100% rename from Small Tools/mrcImageFourierNeighborCorrelation/Makefile.config rename to Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile.config diff --git a/Small Tools/mrcImageFourierNeighborCorrelation/Makefile b/Small Tools/mrcImageFourierNeighborCorrelation/Makefile deleted file mode 100644 index f998f3f..0000000 --- a/Small Tools/mrcImageFourierNeighborCorrelation/Makefile +++ /dev/null @@ -1,50 +0,0 @@ -# -# This is Main Makefile for mrcImageFourierNeighborCorrelation. -# - -#### Input extention #### -INI=mrc -MASK=mask -MASKBACK=maskback -FSC=fsc - -#### Suffixes rule #### -# Defined at Sub - -#### INCLUDE #### --include Makefile.config - -#### Definition #### -# Path of Input File -INPUT_PATH=../../SampleData/1VOM-N.mrc - -### FileData -FILE_NAME=Input - -### ForMask -MASK_F_MODE=4 -MASK_VALUE=0.0125 - -# MaskSize -MASK_SIZE_X=256 -MASK_SIZE_Y=256 -MASK_SIZE_Z=256 - -#### Rules of the list created #### -# Defined at Sub - -##### Commands ##### -# Defined at Sub basically -all:: - make InitialData; - make InputInfo; - make MaskBackImage; - make InputBackImage; - make InputMaskImage; - make FSC; - -##### Commands(Input to Output) ##### -# Defined at Sub -.$(MASK).$(FSC): - mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FSC) -d 0.025 \ - -FSC -mask $*.$(MASK) -maskBack $*.$(MASKBACK); diff --git a/TIPS/BackImage/Makefile b/TIPS/BackImage/Makefile index 63daa4c..910c805 100644 --- a/TIPS/BackImage/Makefile +++ b/TIPS/BackImage/Makefile @@ -2,6 +2,9 @@ # This is Main Makefile for Add Background to Image. # +#### Root Makefile #### +MAKE_ROOT=BackImage + #### Input extention #### NUL=nul IN_BACK=inimrc @@ -11,6 +14,7 @@ BACK=back # Defined at Sub #### INCLUDE #### +-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config -include Makefile.config #### Definition #### diff --git a/TIPS/BackImage/Makefile.config b/TIPS/BackImage/Makefile.config index 76803de..bfbe100 100644 --- a/TIPS/BackImage/Makefile.config +++ b/TIPS/BackImage/Makefile.config @@ -34,6 +34,28 @@ IniBackImage:: BackImage:: make $(BACK_FILE_NAME).$(BACK); +help_BackImage:: + @echo + @echo "BackImage" + @echo "This is Sub Makefile for Add Background to Image." + @echo + @echo " (Command):" + @echo " IniBackImage: Create Inner of Background Image." + @echo " BackImage: Add Background to Image." + @echo + @echo " (Setting Data):" + @echo " BACK_FILE_NAME: filename of input and output" + @echo " IN_BACK: extention of input" + @echo " BACK: extention of output" + @echo " BACK_IN_SIZE_X: Nx of inner of output" + @echo " BACK_IN_SIZE_Y: Ny of inner of output" + @echo " BACK_IN_SIZE_Z: Nz of inner of output" + @echo " BACK_IN_VALUE: value of inner of output" + @echo " BACK_SIZE_X: Nx of output" + @echo " BACK_SIZE_Y: Ny of output" + @echo " BACK_SIZE_Z: Nz of output" + @echo " BACK_VALUE: value of output" + @echo " BACK_LENGTH: length of output" ##### Commands(Input to Output) ##### .$(IN_BACK).$(BACK): diff --git a/TIPS/Help/Makefile.config b/TIPS/Help/Makefile.config new file mode 100644 index 0000000..bed5379 --- /dev/null +++ b/TIPS/Help/Makefile.config @@ -0,0 +1,22 @@ +# +# This is Sub Makefile for Help. +# + +#### Input extention #### +# Defined at Main + +#### Suffixes rule #### + +#### INCLUDE #### + +#### Definition #### +# Defined at Main + +#### Rules of the list created #### + + +##### Commands ##### +help:: + make help_$(MAKE_ROOT); + +##### Commands(Input to Output) ##### diff --git a/TIPS/MaskImage/.EosLog b/TIPS/MaskImage/.EosLog deleted file mode 100644 index f5c549b..0000000 --- a/TIPS/MaskImage/.EosLog +++ /dev/null @@ -1 +0,0 @@ -/Users/teppeikinoshita/Eos/bin/X86MAC64/mrcInfo -i /Users/teppeikinoshita/Desktop/work/img/Input-1VOM-N.mrc diff --git a/TIPS/MaskImage/Makefile b/TIPS/MaskImage/Makefile index 74a23c9..f9f67cb 100644 --- a/TIPS/MaskImage/Makefile +++ b/TIPS/MaskImage/Makefile @@ -2,6 +2,9 @@ # This is Main Makefile for Create Bin Image that has same shape as Input. # +#### Root Makefile #### +MAKE_ROOT=MaskImage + #### Input extention #### IN_MASK=inimrc MASK=mask @@ -10,6 +13,7 @@ MASK=mask # Defined at Sub #### INCLUDE #### +-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config -include Makefile.config #### Definition #### diff --git a/TIPS/MaskImage/Makefile.config b/TIPS/MaskImage/Makefile.config index 329e6d7..34a801c 100644 --- a/TIPS/MaskImage/Makefile.config +++ b/TIPS/MaskImage/Makefile.config @@ -21,6 +21,20 @@ MaskImage:: make $(MASK_FILE_NAME).$(MASK); +help_MaskImage:: + @echo + @echo "MaskImage" + @echo "This is Sub Makefile for Create Mask Image that has same shape as Input." + @echo + @echo " (Command):" + @echo " MaskImage: Create Mask Image that has same shape as Input." + @echo + @echo " (Setting Data):" + @echo " MASK_FILE_NAME: filename of input and output" + @echo " IN_MASK: extention of input" + @echo " MASK: extention of output" + @echo " MASK_VALUE: half value point of low pass filter for output" + @echo " MASK_F_MODE: low pass filter mode" ##### Commands(Input to Output) ##### .$(IN_MASK).$(MASK)tmp: diff --git a/TIPS/NulImage/Makefile b/TIPS/NulImage/Makefile index c764370..8656da2 100644 --- a/TIPS/NulImage/Makefile +++ b/TIPS/NulImage/Makefile @@ -2,6 +2,9 @@ # This is Main Makefile for Create Sample Null Image. # +#### Root Makefile #### +MAKE_ROOT=NulImage + #### Input extention #### NUL=nul @@ -9,6 +12,7 @@ NUL=nul # Defined at Sub #### INCLUDE #### +-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config -include Makefile.config #### Definition #### @@ -20,7 +24,7 @@ NUL_SIZE_Y=10 NUL_SIZE_Z=1 NUL_VALUE=0 # Angstrom per 1 pixel -NULLENGTH=1 +NUL_LENGTH=1 #### Rules of the list created #### # Defined at Sub diff --git a/TIPS/NulImage/Makefile.config b/TIPS/NulImage/Makefile.config index 4b03177..ca53e1f 100644 --- a/TIPS/NulImage/Makefile.config +++ b/TIPS/NulImage/Makefile.config @@ -20,5 +20,21 @@ NulImage:: mrcImageNullImageCreate -o $(NUL_FILE_NAME).$(NUL) \ -Nx $(NUL_SIZE_X) -Ny $(NUL_SIZE_Y) -Nz $(NUL_SIZE_Z) \ -v $(NUL_VALUE) -d $(NUL_LENGTH); - +help_NulImage:: + @echo + @echo "NulImage" + @echo "This is Sub Makefile for Create Sample Null Image." + @echo + @echo " (Command):" + @echo " NulImage: Create Null Image File." + @echo + @echo " (Setting Data):" + @echo " NUL_FILE_NAME: filename of output" + @echo " NUL: extention of output" + @echo " NUL_SIZE_X: Nx of output" + @echo " NUL_SIZE_Y: Ny of output" + @echo " NUL_SIZE_Z: Nz of output" + @echo " NUL_VALUE: value of output" + @echo " NUL_LENGTH: length of output" + ##### Commands(Input to Output) ##### -- 2.11.0