• R/O
  • HTTP
  • SSH
  • HTTPS

tutorial: Commit

This repository is for tutorials of Eos.


Commit MetaInfo

Revision8b3b508176a7ded9aa86df2b3e36aedc73702c7c (tree)
Time2014-10-17 17:22:31
Authorkinoshita-eos <kinoshita@yasu...>
Commiterkinoshita-eos

Log Message

Add: TIPS of Projection for 3D

new file: TIPS/Projection3DImage/Makefile/Makefile
new file: TIPS/Projection3DImage/Makefile/Makefile-lib

Modify: Template of tutorial Makefile.

Changes to be committed:

modified: CTFCorrection/CTFCorrection4/Makefile.config
modified: CTFCorrection/CTFCorrection5/Makefile.config
modified: Small Tools/Template/Makefile/Makefile
modified: Small Tools/Template/Makefile/Makefile-lib
modified: Small Tools/mrcImage/Makefile
modified: Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
modified: Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
renamed: TIPS/BackImage/Makefile -> TIPS/BackImage/Makefile/Makefile
renamed: TIPS/BackImage/Makefile-lib -> TIPS/BackImage/Makefile/Makefile-lib
renamed: TIPS/CreateGridImage/Makefile -> TIPS/CreateGridImage/Makefile/Makefile
renamed: TIPS/CreateGridImage/Makefile-lib -> TIPS/CreateGridImage/Makefile/Makefile-lib
renamed: TIPS/Help/Makefile-lib -> TIPS/Help/Makefile/Makefile-lib
renamed: TIPS/LoopCommand/Makefile -> TIPS/LoopCommand/Makefile/Makefile
renamed: TIPS/LoopCommand/Makefile-lib -> TIPS/LoopCommand/Makefile/Makefile-lib
modified: TIPS/Makefile
renamed: TIPS/MaskImage/Makefile -> TIPS/MaskImage/Makefile/Makefile
renamed: TIPS/MaskImage/Makefile-lib -> TIPS/MaskImage/Makefile/Makefile-lib
renamed: TIPS/NulImage/Makefile -> TIPS/NulImage/Makefile/Makefile
renamed: TIPS/NulImage/Makefile-lib -> TIPS/NulImage/Makefile/Makefile-lib
modified: TIPS/Template/Makefile/Makefile
modified: TIPS/Template/Makefile/Makefile-lib

Change Summary

Incremental Difference

--- a/CTFCorrection/CTFCorrection4/Makefile.config
+++ b/CTFCorrection/CTFCorrection4/Makefile.config
@@ -9,7 +9,7 @@
99 #### Suffixes rule ####
1010
1111 #### INCLUDE ####
12--include ../../TIPS/LoopCommand/Makefile-lib
12+-include ../../TIPS/LoopCommand/Makefile/Makefile-lib
1313 -include ../CTFCorrection2/Makefile.config
1414
1515 #### Definition ####
--- a/CTFCorrection/CTFCorrection5/Makefile.config
+++ b/CTFCorrection/CTFCorrection5/Makefile.config
@@ -8,7 +8,7 @@
88
99 #### INCLUDE ####
1010 -include ../CTFCorrection3/Makefile.config
11--include ../../TIPS/LoopCommand/Makefile-lib
11+-include ../../TIPS/LoopCommand/Makefile/Makefile-lib
1212
1313 #### Definition ####
1414
--- a/Small Tools/Template/Makefile/Makefile
+++ b/Small Tools/Template/Makefile/Makefile
@@ -12,7 +12,7 @@ INI=ini
1212 # Defined at Sub
1313
1414 #### INCLUDE ####
15--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
15+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1616 -include Makefile-lib
1717
1818 #### Definition ####
--- a/Small Tools/Template/Makefile/Makefile-lib
+++ b/Small Tools/Template/Makefile/Makefile-lib
@@ -10,7 +10,7 @@
1010
1111 #### INCLUDE ####
1212 # Use TIPS File.
13-# -include ${EOS_HOME}/tutorial/TIPS/XXXX/Makefile-lib
13+# -include ${EOS_HOME}/tutorial/TIPS/XXXX/Makefile/Makefile-lib
1414
1515 #### Definition ####
1616 # Defined at Main
--- a/Small Tools/mrcImage/Makefile
+++ b/Small Tools/mrcImage/Makefile
@@ -6,7 +6,7 @@
66 MAKE_ROOT=makeTemplate
77
88 #### INCLUDE ####
9--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
9+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1010
1111 #### Definition ####
1212 # Path of Template Files.
--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
@@ -15,7 +15,7 @@ FSC=fsc
1515 # Defined at Sub
1616
1717 #### INCLUDE ####
18--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
18+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1919 -include Makefile-lib
2020
2121 #### Definition ####
--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
@@ -9,8 +9,8 @@
99 .SUFFIXES: .$(INI) .$(INI)info .$(FSC)
1010
1111 #### INCLUDE ####
12--include ${EOS_HOME}/tutorial/TIPS/MaskImage/Makefile-lib
13--include ${EOS_HOME}/tutorial/TIPS/BackImage/Makefile-lib
12+-include ${EOS_HOME}/tutorial/TIPS/MaskImage/Makefile/Makefile-lib
13+-include ${EOS_HOME}/tutorial/TIPS/BackImage/Makefile/Makefile-lib
1414
1515 #### Definition ####
1616 # Defined at Main
--- a/TIPS/BackImage/Makefile
+++ b/TIPS/BackImage/Makefile/Makefile
@@ -14,7 +14,7 @@ BACK=back
1414 # Defined at Sub
1515
1616 #### INCLUDE ####
17--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
17+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1818 -include Makefile-lib
1919
2020 #### Definition ####
--- a/TIPS/BackImage/Makefile-lib
+++ b/TIPS/BackImage/Makefile/Makefile-lib
@@ -9,7 +9,7 @@
99 .SUFFIXES: .$(NUL) .$(IN_BACK) .$(BACK)
1010
1111 #### INCLUDE ####
12--include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile-lib
12+-include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile/Makefile-lib
1313
1414 #### Definition ####
1515 # Defined at Main
--- a/TIPS/CreateGridImage/Makefile-lib
+++ b/TIPS/CreateGridImage/Makefile/Makefile-lib
@@ -9,7 +9,7 @@
99 .SUFFIXES: .$(NUL) .$(ONE) .$(GRID)
1010
1111 #### INCLUDE ####
12--include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile-lib
12+-include ${EOS_HOME}/tutorial/TIPS/NulImage/Makefile/Makefile-lib
1313
1414 #### Definition ####
1515 # Defined at Main
--- a/TIPS/Makefile
+++ b/TIPS/Makefile
@@ -6,7 +6,7 @@
66 MAKE_ROOT=makeTemplate
77
88 #### INCLUDE ####
9--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
9+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1010
1111 #### Definition ####
1212 # Path of Template Files.
--- a/TIPS/MaskImage/Makefile
+++ b/TIPS/MaskImage/Makefile/Makefile
@@ -13,7 +13,7 @@ MASK=mask
1313 # Defined at Sub
1414
1515 #### INCLUDE ####
16--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
16+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1717 -include Makefile-lib
1818
1919 #### Definition ####
--- a/TIPS/NulImage/Makefile
+++ b/TIPS/NulImage/Makefile/Makefile
@@ -12,7 +12,7 @@ NUL=nul
1212 # Defined at Sub
1313
1414 #### INCLUDE ####
15--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
15+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1616 -include Makefile-lib
1717
1818 #### Definition ####
--- /dev/null
+++ b/TIPS/Projection3DImage/Makefile/Makefile
@@ -0,0 +1,49 @@
1+#
2+# This is Main Makefile for Projection3DImage.
3+#
4+
5+#### Root Makefile ####
6+MAKE_ROOT=Projection3DImage
7+
8+#### Input extention ####
9+INI=ini
10+OUT=tiff
11+
12+#### Suffixes rule ####
13+# Defined at Sub
14+
15+#### INCLUDE ####
16+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
17+-include Makefile-lib
18+
19+#### Definition ####
20+# Path of Input File
21+# Basically, use a linked data from /SampleData.
22+INPUT_PATH=${EOS_HOME}/tutorial/SampleData/1VOM-N.mrc
23+
24+### FileData
25+FILE_NAME=Input
26+
27+#### Rules of the list created ####
28+# Defined at Sub
29+
30+##### Commands #####
31+# Defined at Sub basically
32+Initial::
33+ touch $(FILE_NAME).$(INI);
34+ rm $(FILE_NAME).$(INI);
35+ ln -s $(INPUT_PATH) $(FILE_NAME).$(INI);
36+
37+Exe::
38+ @export PRJ_FILE_NAME=$(FILE_NAME); \
39+ export IN_PRJ=$(INI); \
40+ export PRJ=$(INI)2d; \
41+ export OUT_PRJ=$(OUT); \
42+ make Projection3DImage;
43+
44+all::
45+ make Initial;
46+ make Exe;
47+
48+##### Commands(Input to Output) #####
49+# Defined at Sub
--- /dev/null
+++ b/TIPS/Projection3DImage/Makefile/Makefile-lib
@@ -0,0 +1,48 @@
1+#
2+# This is Sub Makefile for Projection3DImage.
3+#
4+
5+#### Input extention ####
6+# Defined at Main
7+
8+#### Suffixes rule ####
9+.SUFFIXES: .$(IN_PRJ) .$(PRJ) .$(OUT_PRJ)
10+
11+#### INCLUDE ####
12+# Use TIPS File.
13+# -include ${EOS_HOME}/tutorial/TIPS/XXXX/Makefile/Makefile-lib
14+
15+#### Definition ####
16+# Defined at Main
17+
18+#### Rules of the list created ####
19+Projection3DImage::
20+ @for (( LoopNum = 0; LoopNum <= 2; LoopNum++ )) \
21+ do \
22+ export LoopNum; \
23+ make Projection3D; \
24+ make $(PRJ_FILE_NAME)-$$LoopNum.$(OUT_PRJ); \
25+ done;
26+
27+Projection3D::
28+ mrcImageProjection -i $(PRJ_FILE_NAME).$(IN_PRJ) -o $(PRJ_FILE_NAME)-$$LoopNum.$(PRJ) -m $$LoopNum;
29+
30+##### Commands #####
31+help_Projection3DImage::
32+ @echo
33+ @echo "Projection3DImage"
34+ @echo "This is Sub Makefile for Projection3DImage."
35+ @echo
36+ @echo " (Command):"
37+ @echo " Projection3DImage: Create projection Image on planes xy, yz, zx."
38+ @echo
39+ @echo " (Setting Data):"
40+ @echo " PRJ_FILE_NAME: Input File name."
41+ @echo " IN_PRJ: Input 3D File extention"
42+ @echo " PRJ: Projected 2D File extention"
43+ @echo " OUT_PRJ: Projected 2D Image extention"
44+ @echo
45+
46+##### Commands(Input to Output) #####
47+.$(PRJ).$(OUT_PRJ):
48+ mrc2tiff -i $*.$(PRJ) -o $*.$(OUT_PRJ)
--- a/TIPS/Template/Makefile/Makefile
+++ b/TIPS/Template/Makefile/Makefile
@@ -12,7 +12,7 @@ INI=ini
1212 # Defined at Sub
1313
1414 #### INCLUDE ####
15--include ${EOS_HOME}/tutorial/TIPS/Help/Makefile-lib
15+-include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
1616 -include Makefile-lib
1717
1818 #### Definition ####
@@ -28,7 +28,16 @@ FILE_NAME=Input
2828
2929 ##### Commands #####
3030 # Defined at Sub basically
31+Initial::
32+ touch $(FILE_NAME).$(INI);
33+ rm $(FILE_NAME).$(INI);
34+ ln -s $(INPUT_PATH) $(FILE_NAME).$(INI);
35+
36+Exe::
37+
3138 all::
39+ make Initial;
40+ make Exe;
3241
3342 ##### Commands(Input to Output) #####
3443 # Defined at Sub
--- a/TIPS/Template/Makefile/Makefile-lib
+++ b/TIPS/Template/Makefile/Makefile-lib
@@ -10,7 +10,7 @@
1010
1111 #### INCLUDE ####
1212 # Use TIPS File.
13-# -include ${EOS_HOME}/tutorial/TIPS/XXXX/Makefile-lib
13+# -include ${EOS_HOME}/tutorial/TIPS/XXXX/Makefile/Makefile-lib
1414
1515 #### Definition ####
1616 # Defined at Main
Show on old repository browser