Modify: Setting of -kV -Cs -df -Ain for CTFCorrection

	modified:   CTFCorrection/CTFCorrection2/Makefile
	modified:   CTFCorrection/CTFCorrection3/Makefile

diff --git a/CTFCorrection/CTFCorrection2/Makefile b/CTFCorrection/CTFCorrection2/Makefile
index 6db936f..3a75145 100644 (file)
--- a/CTFCorrection/CTFCorrection2/Makefile
+++ b/CTFCorrection/CTFCorrection2/Makefile
@@ -68,6 +68,12 @@ NSRATIO=0
 ### For mrcImageSiemensStar
 SSTAR_SHAPE=0
 
+## For mrcImageCTFObservation
+CTF_KV=200
+CTF_CS=2.1
+CTF_DEFOCUS=27000
+CTF_AIN=0.3
+
 #### For Works ####
 JOP_NUM=-j 3
 
@@ -131,7 +137,8 @@ Test::
        rm $*.$(INPUT_2D_EXT)tmp
 
 .$(INPUT_2D_EXT).$(CTF_2D_EXT):
-       mrcImageCTFObservation -i $*.$(INPUT_2D_EXT) -o $*.$(CTF_2D_EXT)
+       mrcImageCTFObservation -i $*.$(INPUT_2D_EXT) -o $*.$(CTF_2D_EXT) \
+                                                       -kV $(CTF_KV) -Cs $(CTF_CS) -df $(CTF_DEFOCUS) -Ain $(CTF_AIN);
 
 .$(OUT_CTF_EXT).tiff:
        mrc2tiff -i $*.$(OUT_CTF_EXT) -o $*_ctf.tiff

diff --git a/CTFCorrection/CTFCorrection3/Makefile b/CTFCorrection/CTFCorrection3/Makefile
index c02f2e0..e3e87ff 100644 (file)
--- a/CTFCorrection/CTFCorrection3/Makefile
+++ b/CTFCorrection/CTFCorrection3/Makefile
@@ -16,8 +16,11 @@
 -include CTFInfo1List
 
 #### Definition ####
-## For mrcImageCTFObservation
-CTF_DEFOCUS=9000
+## For mrcImageCTFObservation 2
+CTF2_KV=200
+CTF2_CS=2.1
+CTF2_DEFOCUS=9000
+CTF2_AIN=0.3
 
 #### Rules of the list created ####
 ctfinfoauto2:  $(FFTS:.fft=.ctfinfoauto2)
@@ -46,7 +49,8 @@ all1::
        make ImageAverage;
 
 ProcessForInput2::
-       mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT) -df $(CTF_DEFOCUS);
+       mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT) \
+                                                       -kV $(CTF2_KV) -Cs $(CTF2_CS) -df $(CTF2_DEFOCUS) -Ain $(CTF2_AIN);
        ln -s $(INPUT)-2.$(CTF_2D_EXT) $(INPUT)-2.mrc;
        mrc2tiff -i $(INPUT)-2.$(INPUT_2D_EXT) -o $(INPUT)-2_org.tiff;
        mrc2tiff -i $(INPUT)-2.$(CTF_2D_EXT) -o $(INPUT)-2_i.tiff -I;