Bug Fixed: Modify order of Observation and AddNoise for CTF Correction tutotial.

	modified:   CTFCorrection/CTFCorrection2/Makefile.config
	modified:   CTFCorrection/CTFCorrection3/Makefile.config

diff --git a/CTFCorrection/CTFCorrection2/Makefile.config b/CTFCorrection/CTFCorrection2/Makefile.config
index e1153c7..3a4be04 100644 (file)
--- a/CTFCorrection/CTFCorrection2/Makefile.config
+++ b/CTFCorrection/CTFCorrection2/Makefile.config
@@ -65,9 +65,7 @@ InitialCTFDataFromMRC::
        cp $(INPUT).$(INI_MRC_EXT) $(INPUT).$(INPUT_2D_EXT);
        
 InitialSiemensStar::
-       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;
+       mrcImageSiemensStar -o $(INPUT).$(INPUT_2D_EXT) -m 2 -Shape $(SSTAR_SHAPE);
 
 ProcessForInput::
        make $(INPUT).$(CTF_2D_EXT);
@@ -95,8 +93,10 @@ ProcessForInput::
        rm $*.$(INPUT_2D_EXT)tmp
 
 .$(INPUT_2D_EXT).$(CTF_2D_EXT):
-       mrcImageCTFObservation -i $*.$(INPUT_2D_EXT) -o $*.$(CTF_2D_EXT) -ctfMode $(CTF_MODE) \
+       mrcImageCTFObservation -i $*.$(INPUT_2D_EXT) -o $*.$(CTF_2D_EXT)tmp -ctfMode $(CTF_MODE) \
                                                        -kV $(CTF_KV) -Cs $(CTF_CS) -df $(CTF_DEFOCUS) -Ain $(CTF_AIN);
+       mrcImageNoiseAdd -i $(INPUT).$(CTF_2D_EXT)tmp -o $(INPUT).$(CTF_2D_EXT) -NS $(NSRATIO) -SD 1;
+       rm $(INPUT).$(CTF_2D_EXT)tmp;
 
 .$(OUT_CTF_EXT).tiff:
        mrc2tiff -i $*.$(OUT_CTF_EXT) -o $*_ctf.tiff

diff --git a/CTFCorrection/CTFCorrection3/Makefile.config b/CTFCorrection/CTFCorrection3/Makefile.config
index e3fcfdb..d4c7bbf 100644 (file)
--- a/CTFCorrection/CTFCorrection3/Makefile.config
+++ b/CTFCorrection/CTFCorrection3/Makefile.config
@@ -30,8 +30,10 @@ CTFInfo1List::
 
 ##### Commands #####
 ProcessForInput2::
-       mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT) -ctfMode $(CTF2_MODE) \
+       mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT)tmp -ctfMode $(CTF2_MODE) \
                                                        -kV $(CTF2_KV) -Cs $(CTF2_CS) -df $(CTF2_DEFOCUS) -Ain $(CTF2_AIN);
+       mrcImageNoiseAdd -i $(INPUT).$(CTF_2D_EXT)tmp -o $(INPUT).$(CTF_2D_EXT) -NS $(NSRATIO) -SD 1;
+       rm $(INPUT).$(CTF_2D_EXT)tmp;
        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;