• R/O
  • HTTP
  • SSH
  • HTTPS

tutorial: Commit

This repository is for tutorials of Eos.


Commit MetaInfo

Revision388b3ef7e70e6567b60192d15dd086d944d7b8e5 (tree)
Time2014-10-17 09:54:53
Authorkinoshita-eos <kinoshita@yasu...>
Commiterkinoshita-eos

Log Message

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

Change Summary

Incremental Difference

--- /dev/null
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
@@ -0,0 +1,79 @@
1+#
2+# This is Main Makefile for mrcImageFourierNeighborCorrelation.
3+#
4+
5+#### Root Makefile ####
6+MAKE_ROOT=mrcImageFourierNeighborCorrelation
7+
8+#### Input extention ####
9+INI=mrc
10+MASK=mask
11+MASKBACK=maskback
12+FSC=fsc
13+
14+#### Suffixes rule ####
15+# Defined at Sub
16+
17+#### INCLUDE ####
18+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
19+-include Makefile.config
20+
21+#### Definition ####
22+# Path of Input File
23+INPUT_PATH=${EOS_HOME}/tutorial/SampleData/1VOM-N.mrc
24+
25+### FileData
26+FILE_NAME=Input
27+
28+### ForMask
29+MASK_F_MODE=4
30+MASK_VALUE=0.0125
31+
32+# MaskSize
33+MASK_SIZE_X=256
34+MASK_SIZE_Y=256
35+MASK_SIZE_Z=256
36+
37+#### Rules of the list created ####
38+# Defined at Sub
39+
40+##### Commands #####
41+# Defined at Sub basically
42+Initial::
43+ make InitialData;
44+ make InputInfo;
45+ make MaskBackImage;
46+ make InputBackImage;
47+ make InputMaskImage;
48+
49+all::
50+ make Initial;
51+ make FSC;
52+
53+help_mrcImageFourierNeighborCorrelation::
54+ @echo
55+ @echo "Makefile for mrcImageFourierNeighborCorrelation"
56+ @echo "This is Main Makefile for mrcImageFourierNeighborCorrelation."
57+ @echo
58+ @echo " (Command):"
59+ @echo " Initial: Create Initial File for execution."
60+ @echo " (Setting Data):"
61+ @echo " INI: input extention"
62+ @echo " INIpad: for -i"
63+ @echo " MASK: for -mask"
64+ @echo " MASKBACK: for -maskBack"
65+ @echo " FSC: Sample of execution."
66+ @echo
67+ @echo " (Setting Data):"
68+ @echo " FILE_NAME: filename of input and output"
69+ @echo " MASK_SIZE_X: size x of covering whole image"
70+ @echo " MASK_SIZE_Y: size y of covering whole image"
71+ @echo " MASK_SIZE_Z: size z of covering whole image"
72+ @echo " MASK_VALUE: value of outer image"
73+ @echo " MASK_F_MODE: low pass filter mode for mask"
74+
75+##### Commands(Input to Output) #####
76+# Defined at Sub
77+.$(MASK).$(FSC):
78+ mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FSC) -d 0.025 \
79+ -FSC -mask $*.$(MASK) -maskBack $*.$(MASKBACK);
similarity index 100%
rename from Small Tools/mrcImageFourierNeighborCorrelation/Makefile.config
rename to Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile.config
--- a/Small Tools/mrcImageFourierNeighborCorrelation/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
1-#
2-# This is Main Makefile for mrcImageFourierNeighborCorrelation.
3-#
4-
5-#### Input extention ####
6-INI=mrc
7-MASK=mask
8-MASKBACK=maskback
9-FSC=fsc
10-
11-#### Suffixes rule ####
12-# Defined at Sub
13-
14-#### INCLUDE ####
15--include Makefile.config
16-
17-#### Definition ####
18-# Path of Input File
19-INPUT_PATH=../../SampleData/1VOM-N.mrc
20-
21-### FileData
22-FILE_NAME=Input
23-
24-### ForMask
25-MASK_F_MODE=4
26-MASK_VALUE=0.0125
27-
28-# MaskSize
29-MASK_SIZE_X=256
30-MASK_SIZE_Y=256
31-MASK_SIZE_Z=256
32-
33-#### Rules of the list created ####
34-# Defined at Sub
35-
36-##### Commands #####
37-# Defined at Sub basically
38-all::
39- make InitialData;
40- make InputInfo;
41- make MaskBackImage;
42- make InputBackImage;
43- make InputMaskImage;
44- make FSC;
45-
46-##### Commands(Input to Output) #####
47-# Defined at Sub
48-.$(MASK).$(FSC):
49- mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FSC) -d 0.025 \
50- -FSC -mask $*.$(MASK) -maskBack $*.$(MASKBACK);
--- a/TIPS/BackImage/Makefile
+++ b/TIPS/BackImage/Makefile
@@ -2,6 +2,9 @@
22 # This is Main Makefile for Add Background to Image.
33 #
44
5+#### Root Makefile ####
6+MAKE_ROOT=BackImage
7+
58 #### Input extention ####
69 NUL=nul
710 IN_BACK=inimrc
@@ -11,6 +14,7 @@ BACK=back
1114 # Defined at Sub
1215
1316 #### INCLUDE ####
17+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
1418 -include Makefile.config
1519
1620 #### Definition ####
--- a/TIPS/BackImage/Makefile.config
+++ b/TIPS/BackImage/Makefile.config
@@ -34,6 +34,28 @@ IniBackImage::
3434 BackImage::
3535 make $(BACK_FILE_NAME).$(BACK);
3636
37+help_BackImage::
38+ @echo
39+ @echo "BackImage"
40+ @echo "This is Sub Makefile for Add Background to Image."
41+ @echo
42+ @echo " (Command):"
43+ @echo " IniBackImage: Create Inner of Background Image."
44+ @echo " BackImage: Add Background to Image."
45+ @echo
46+ @echo " (Setting Data):"
47+ @echo " BACK_FILE_NAME: filename of input and output"
48+ @echo " IN_BACK: extention of input"
49+ @echo " BACK: extention of output"
50+ @echo " BACK_IN_SIZE_X: Nx of inner of output"
51+ @echo " BACK_IN_SIZE_Y: Ny of inner of output"
52+ @echo " BACK_IN_SIZE_Z: Nz of inner of output"
53+ @echo " BACK_IN_VALUE: value of inner of output"
54+ @echo " BACK_SIZE_X: Nx of output"
55+ @echo " BACK_SIZE_Y: Ny of output"
56+ @echo " BACK_SIZE_Z: Nz of output"
57+ @echo " BACK_VALUE: value of output"
58+ @echo " BACK_LENGTH: length of output"
3759
3860 ##### Commands(Input to Output) #####
3961 .$(IN_BACK).$(BACK):
--- /dev/null
+++ b/TIPS/Help/Makefile.config
@@ -0,0 +1,22 @@
1+#
2+# This is Sub Makefile for Help.
3+#
4+
5+#### Input extention ####
6+# Defined at Main
7+
8+#### Suffixes rule ####
9+
10+#### INCLUDE ####
11+
12+#### Definition ####
13+# Defined at Main
14+
15+#### Rules of the list created ####
16+
17+
18+##### Commands #####
19+help::
20+ make help_$(MAKE_ROOT);
21+
22+##### Commands(Input to Output) #####
--- a/TIPS/MaskImage/.EosLog
+++ /dev/null
@@ -1 +0,0 @@
1-/Users/teppeikinoshita/Eos/bin/X86MAC64/mrcInfo -i /Users/teppeikinoshita/Desktop/work/img/Input-1VOM-N.mrc
--- a/TIPS/MaskImage/Makefile
+++ b/TIPS/MaskImage/Makefile
@@ -2,6 +2,9 @@
22 # This is Main Makefile for Create Bin Image that has same shape as Input.
33 #
44
5+#### Root Makefile ####
6+MAKE_ROOT=MaskImage
7+
58 #### Input extention ####
69 IN_MASK=inimrc
710 MASK=mask
@@ -10,6 +13,7 @@ MASK=mask
1013 # Defined at Sub
1114
1215 #### INCLUDE ####
16+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
1317 -include Makefile.config
1418
1519 #### Definition ####
--- a/TIPS/MaskImage/Makefile.config
+++ b/TIPS/MaskImage/Makefile.config
@@ -21,6 +21,20 @@
2121 MaskImage::
2222 make $(MASK_FILE_NAME).$(MASK);
2323
24+help_MaskImage::
25+ @echo
26+ @echo "MaskImage"
27+ @echo "This is Sub Makefile for Create Mask Image that has same shape as Input."
28+ @echo
29+ @echo " (Command):"
30+ @echo " MaskImage: Create Mask Image that has same shape as Input."
31+ @echo
32+ @echo " (Setting Data):"
33+ @echo " MASK_FILE_NAME: filename of input and output"
34+ @echo " IN_MASK: extention of input"
35+ @echo " MASK: extention of output"
36+ @echo " MASK_VALUE: half value point of low pass filter for output"
37+ @echo " MASK_F_MODE: low pass filter mode"
2438
2539 ##### Commands(Input to Output) #####
2640 .$(IN_MASK).$(MASK)tmp:
--- a/TIPS/NulImage/Makefile
+++ b/TIPS/NulImage/Makefile
@@ -2,6 +2,9 @@
22 # This is Main Makefile for Create Sample Null Image.
33 #
44
5+#### Root Makefile ####
6+MAKE_ROOT=NulImage
7+
58 #### Input extention ####
69 NUL=nul
710
@@ -9,6 +12,7 @@ NUL=nul
912 # Defined at Sub
1013
1114 #### INCLUDE ####
15+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile.config
1216 -include Makefile.config
1317
1418 #### Definition ####
@@ -20,7 +24,7 @@ NUL_SIZE_Y=10
2024 NUL_SIZE_Z=1
2125 NUL_VALUE=0
2226 # Angstrom per 1 pixel
23-NULLENGTH=1
27+NUL_LENGTH=1
2428
2529 #### Rules of the list created ####
2630 # Defined at Sub
--- a/TIPS/NulImage/Makefile.config
+++ b/TIPS/NulImage/Makefile.config
@@ -20,5 +20,21 @@ NulImage::
2020 mrcImageNullImageCreate -o $(NUL_FILE_NAME).$(NUL) \
2121 -Nx $(NUL_SIZE_X) -Ny $(NUL_SIZE_Y) -Nz $(NUL_SIZE_Z) \
2222 -v $(NUL_VALUE) -d $(NUL_LENGTH);
23-
23+help_NulImage::
24+ @echo
25+ @echo "NulImage"
26+ @echo "This is Sub Makefile for Create Sample Null Image."
27+ @echo
28+ @echo " (Command):"
29+ @echo " NulImage: Create Null Image File."
30+ @echo
31+ @echo " (Setting Data):"
32+ @echo " NUL_FILE_NAME: filename of output"
33+ @echo " NUL: extention of output"
34+ @echo " NUL_SIZE_X: Nx of output"
35+ @echo " NUL_SIZE_Y: Ny of output"
36+ @echo " NUL_SIZE_Z: Nz of output"
37+ @echo " NUL_VALUE: value of output"
38+ @echo " NUL_LENGTH: length of output"
39+
2440 ##### Commands(Input to Output) #####
Show on old repository browser