Modify: support of Noise Data for CTFCorrection

	modified:   CTFCorrection/CTFCorrection2/Makefile
Modify: add variable for defocus
	modified:   CTFCorrection/CTFCorrection3/Makefile

diff --git a/CTFCorrection/CTFCorrection2/Makefile b/CTFCorrection/CTFCorrection2/Makefile
index f0b3217..6db936f 100644 (file)
--- a/CTFCorrection/CTFCorrection2/Makefile
+++ b/CTFCorrection/CTFCorrection2/Makefile
@@ -62,7 +62,11 @@ PROJECTION_START_Y=-`expr $(PROJECTION_PIXEL_Y) / 4`
 #PROJECTION_START_Y=0
 
 ### For mrcImageNoiseAdd
-SNRATIO=10000
+SNRATIO=1
+NSRATIO=0
+
+### For mrcImageSiemensStar
+SSTAR_SHAPE=0
 
 #### For Works ####
 JOP_NUM=-j 3
@@ -75,8 +79,8 @@ $(CTF_2D_EXT):$(INPUT_2D_LIST:.$(INPUT_2D_EXT)=.$(CTF_2D_EXT))
 ##### Commands #####
 all::
 #      make InitialCTFDataFromPDB;
-#      make InitialSiemensStar;
-       make InitialCTFDataFromMRC;
+       make InitialSiemensStar;
+#      make InitialCTFDataFromMRC;
        make ProcessForInput;
        make TIF2CTF;
        make $(INPUT).tiff
@@ -89,7 +93,9 @@ InitialCTFDataFromMRC::
        cp $(INPUT).$(INI_MRC_EXT) $(INPUT).$(INPUT_2D_EXT);
        
 InitialSiemensStar::
-       mrcImageSiemensStar -o $(INPUT).$(INPUT_2D_EXT);
+       mrcImageSiemensStar -o $(INPUT).$(INPUT_2D_EXT)tmp -m 2 -Shape $(SSTAR_SHAPE);
+       mrcImageNoiseAdd -i $(INPUT).$(INPUT_2D_EXT)tmp -o $(INPUT).$(INPUT_2D_EXT) -NS $(NSRATIO) -SD 1;
+       rm $(INPUT).$(INPUT_2D_EXT)tmp;
 
 ProcessForInput::
        make $(INPUT).$(CTF_2D_EXT);

diff --git a/CTFCorrection/CTFCorrection3/Makefile b/CTFCorrection/CTFCorrection3/Makefile
index bc2a969..c02f2e0 100644 (file)
--- a/CTFCorrection/CTFCorrection3/Makefile
+++ b/CTFCorrection/CTFCorrection3/Makefile
@@ -16,7 +16,8 @@
 -include CTFInfo1List
 
 #### Definition ####
-
+## For mrcImageCTFObservation
+CTF_DEFOCUS=9000
 
 #### Rules of the list created ####
 ctfinfoauto2:  $(FFTS:.fft=.ctfinfoauto2)
@@ -45,7 +46,7 @@ all1::
        make ImageAverage;
 
 ProcessForInput2::
-       mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT) -df 9000;
+       mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT) -df $(CTF_DEFOCUS);
        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;