• R/O
  • HTTP
  • SSH
  • HTTPS

tutorial: Commit

This repository is for tutorials of Eos.


Commit MetaInfo

Revisionba36b9f43c84b009f598ee35dbae7827ba8f171e (tree)
Time2014-09-24 08:43:54
Authorkinoshita-eos <kinoshita@yasu...>
Commiterkinoshita-eos

Log Message

Bug Fixed: Modify order of Observation and AddNoise for CTF Correction tutotial.
modified: CTFCorrection/CTFCorrection2/Makefile.config
modified: CTFCorrection/CTFCorrection3/Makefile.config

Change Summary

Incremental Difference

--- a/CTFCorrection/CTFCorrection2/Makefile.config
+++ b/CTFCorrection/CTFCorrection2/Makefile.config
@@ -65,9 +65,7 @@ InitialCTFDataFromMRC::
6565 cp $(INPUT).$(INI_MRC_EXT) $(INPUT).$(INPUT_2D_EXT);
6666
6767 InitialSiemensStar::
68- mrcImageSiemensStar -o $(INPUT).$(INPUT_2D_EXT)tmp -m 2 -Shape $(SSTAR_SHAPE);
69- mrcImageNoiseAdd -i $(INPUT).$(INPUT_2D_EXT)tmp -o $(INPUT).$(INPUT_2D_EXT) -NS $(NSRATIO) -SD 1;
70- rm $(INPUT).$(INPUT_2D_EXT)tmp;
68+ mrcImageSiemensStar -o $(INPUT).$(INPUT_2D_EXT) -m 2 -Shape $(SSTAR_SHAPE);
7169
7270 ProcessForInput::
7371 make $(INPUT).$(CTF_2D_EXT);
@@ -95,8 +93,10 @@ ProcessForInput::
9593 rm $*.$(INPUT_2D_EXT)tmp
9694
9795 .$(INPUT_2D_EXT).$(CTF_2D_EXT):
98- mrcImageCTFObservation -i $*.$(INPUT_2D_EXT) -o $*.$(CTF_2D_EXT) -ctfMode $(CTF_MODE) \
96+ mrcImageCTFObservation -i $*.$(INPUT_2D_EXT) -o $*.$(CTF_2D_EXT)tmp -ctfMode $(CTF_MODE) \
9997 -kV $(CTF_KV) -Cs $(CTF_CS) -df $(CTF_DEFOCUS) -Ain $(CTF_AIN);
98+ mrcImageNoiseAdd -i $(INPUT).$(CTF_2D_EXT)tmp -o $(INPUT).$(CTF_2D_EXT) -NS $(NSRATIO) -SD 1;
99+ rm $(INPUT).$(CTF_2D_EXT)tmp;
100100
101101 .$(OUT_CTF_EXT).tiff:
102102 mrc2tiff -i $*.$(OUT_CTF_EXT) -o $*_ctf.tiff
--- a/CTFCorrection/CTFCorrection3/Makefile.config
+++ b/CTFCorrection/CTFCorrection3/Makefile.config
@@ -30,8 +30,10 @@ CTFInfo1List::
3030
3131 ##### Commands #####
3232 ProcessForInput2::
33- mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT) -ctfMode $(CTF2_MODE) \
33+ mrcImageCTFObservation -i $(INPUT).$(INPUT_2D_EXT) -o $(INPUT)-2.$(CTF_2D_EXT)tmp -ctfMode $(CTF2_MODE) \
3434 -kV $(CTF2_KV) -Cs $(CTF2_CS) -df $(CTF2_DEFOCUS) -Ain $(CTF2_AIN);
35+ mrcImageNoiseAdd -i $(INPUT).$(CTF_2D_EXT)tmp -o $(INPUT).$(CTF_2D_EXT) -NS $(NSRATIO) -SD 1;
36+ rm $(INPUT).$(CTF_2D_EXT)tmp;
3537 ln -s $(INPUT)-2.$(CTF_2D_EXT) $(INPUT)-2.mrc;
3638 mrc2tiff -i $(INPUT)-2.$(INPUT_2D_EXT) -o $(INPUT)-2_org.tiff;
3739 mrc2tiff -i $(INPUT)-2.$(CTF_2D_EXT) -o $(INPUT)-2_i.tiff -I;
Show on old repository browser