From: kinoshita-eos <kinoshita@yasunaga-lab.bio.kyutech.ac.jp>
Date: Thu, 9 Oct 2014 07:55:08 +0000 (+0900)
Subject: Add: Support CTF for Grid or 1Point Image.(make all2D)
X-Git-Tag: v2.0.2p0031
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=refs%2Ftags%2Fv2.0.2p0031;p=eos%2Ftutorial.git

Add: Support CTF for Grid or 1Point Image.(make all2D)
	modified:   CTFCorrection/CTFCorrection2/Makefile
	modified:   CTFCorrection/CTFCorrection2/Makefile.config
---

diff --git a/CTFCorrection/CTFCorrection2/Makefile b/CTFCorrection/CTFCorrection2/Makefile
index 855526d..7e244a2 100644
--- a/CTFCorrection/CTFCorrection2/Makefile
+++ b/CTFCorrection/CTFCorrection2/Makefile
@@ -10,6 +10,9 @@ CTF_2D_EXT=prectf
 FFT_2D_EXT=fft
 CTF_INFO_EXT=ctfinfo
 OUT_CTF_EXT=ctf
+ONE=one
+NUL=nul
+GRID=grid
 
 #### Suffixes rule ####
 
@@ -19,8 +22,23 @@ OUT_CTF_EXT=ctf
 #### Definition ####
 CCD=14.0
 
+### For create mrc image
+1SIZE_X=64
+1SIZE_Y=64
+1SIZE_Z=1
+POINT_X=32
+POINT_Y=32
+POINT_Z=0
+BACK_VALUE=0
+LENGTH=1
+POINT_VALUE=1
+NUM_X=1
+NUM_Y=1
+NUM_Z=1
+
 # Input FileName
 INPUT=Input
+FILE_NAME=$(INPUT)
 
 ### For mrcImageNoiseAdd
 NSRATIO=0
@@ -56,5 +74,14 @@ all2S::
 	make TIF2CTF;
 	make $(INPUT).tiff
 
+all2D::
+	make NulImage;
+	make 1PointImage;
+	make GridImage;
+	ln -s $(INPUT).$(GRID) $(INPUT).$(INPUT_2D_EXT)
+	make ProcessForInput;
+	make TIF2CTF;
+	make $(INPUT).tiff
+
 ##### Commands(Input to Output) #####
 	
\ No newline at end of file
diff --git a/CTFCorrection/CTFCorrection2/Makefile.config b/CTFCorrection/CTFCorrection2/Makefile.config
index 3a4be04..9b71337 100644
--- a/CTFCorrection/CTFCorrection2/Makefile.config
+++ b/CTFCorrection/CTFCorrection2/Makefile.config
@@ -15,6 +15,7 @@ INPUT_3D_EXT=3d
 
 #### INCLUDE ####
 -include ../CTFCorrection1/Makefile
+-include ../../TIPS/CreateGridImage/Makefile.config
 -include INPUT_2D_LIST
 -include CTF_2D_LIST
 -include FFT_2D_LIST