Bug fixed: for CTFCorrection5

	modified:   CTFCorrection/CTFCorrection3/Makefile.config
	modified:   CTFCorrection/CTFCorrection5/Makefile
	modified:   TIPS/LoopCommand/Makefile.config

diff --git a/CTFCorrection/CTFCorrection3/Makefile.config b/CTFCorrection/CTFCorrection3/Makefile.config
index f29963e..e3fcfdb 100644 (file)
--- a/CTFCorrection/CTFCorrection3/Makefile.config
+++ b/CTFCorrection/CTFCorrection3/Makefile.config
@@ -51,10 +51,10 @@ TIF2CTF2::
 #      make CTFS;
        
 ImageAverage::
-       touch CTF_LIST;
-       rm CTF_LIST;
-       ls -1 *.ctf >> CTF_LIST;
-       mrcImageAverage -i CTF_LIST -o $(INPUT).avg;
+       touch CTF.list;
+       rm CTF.list;
+       ls -1 *.ctf >> CTF.list;
+       mrcImageAverage -i CTF.list -o $(INPUT).avg;
        mrc2tiff -i $(INPUT).avg -o $(INPUT)_avg.tiff;
 
 ##### Commands(Input to Output) #####

diff --git a/CTFCorrection/CTFCorrection5/Makefile b/CTFCorrection/CTFCorrection5/Makefile
index 001358c..2c159fe 100644 (file)
--- a/CTFCorrection/CTFCorrection5/Makefile
+++ b/CTFCorrection/CTFCorrection5/Makefile
@@ -51,12 +51,27 @@ JOP_NUM=-j 3
 
 
 ##### Commands #####
+all3::
+       make InitialCTFDataFromMRC;
+       make ProcessForInput;
+       make ProcessForInput2;
+       make TIF2CTF2;
+       make ImageAverage
+
+all3S::
+       make InitialSiemensStar;
+       make ProcessForInput;
+       make ProcessForInput2;
+       make TIF2CTF2;
+       make ImageAverage
+
 all5::
        make InitialCTFDataFromMRC;
        make ProcessForInput;
        make ProcessForInput2;
        make TIF2CTF2;
        make MULTICTF;
+       make CTF2TIFF;
 
 all5S::
        make InitialSiemensStar;
@@ -64,6 +79,7 @@ all5S::
        make ProcessForInput2;
        make TIF2CTF2;
        make MULTICTF;
+       make CTF2TIFF;
 
 ##### Commands(Input to Output) #####
 

diff --git a/TIPS/LoopCommand/Makefile.config b/TIPS/LoopCommand/Makefile.config
index 2f79960..7d8241c 100644 (file)
--- a/TIPS/LoopCommand/Makefile.config
+++ b/TIPS/LoopCommand/Makefile.config
@@ -61,6 +61,7 @@ LoopCommandEachFile::
 
 InputList::
        touch $(INPUT_EXT).$(LIST_EXT)
+       rm $(INPUT_EXT).$(LIST_EXT)
        ls -1 *.$(INPUT_EXT) >> $(INPUT_EXT).$(LIST_EXT)
 
 LoopCommandHelp::