Modify: mrcImageFourierNeighborCorrelation

	modified:   Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
	modified:   Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
Modify: Debugger
	modified:   Small Tools/mrcImage/mrcImageROI3D/Makefile/Makefile
	modified:   TIPS/Debugger/Makefile/Makefile-lib
Modify: Bug fixed for Gnuplot
	modified:   TIPS/Gnuplot/Makefile/Makefile-lib

diff --git a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
index fc2f7ad..6e8fe82 100644 (file)
--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
@@ -44,8 +44,8 @@ MASK_SIZE_Z=256
 # FNC Graph Image
 X_SIZE_GRAPH=360
 Y_SIZE_GRAPH=240
-S_DATA=11
-E_DATA=11
+S_DATA=1
+E_DATA=1
 
 #### Rules of the list created ####
 # Defined at Sub
@@ -97,6 +97,6 @@ help_mrcImageFourierNeighborCorrelation::
 ##### Commands(Input to Output) #####
 # Defined at Sub
 .$(MASK).$(FNC):
-       mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FNC) \
+       mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FNC) -d 0.025 \
                                                                                -FSC -mask $*.$(MASK) -maskBack $*.$(MASKBACK) \
-                                                                               -NoiseWeighted 10 -FSCfull -Cref;
+                                                                               -NoiseWeighted -100 -FSCfull -Cref;

diff --git a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
index 5a4aef6..01a3f1d 100644 (file)
--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
@@ -91,7 +91,7 @@ FNCGnuplot::
        data=FNC; \
        export IN_GNU=$$data; \
        export OUT_GNU_FILE_NAME="$(FILE_NAME)-$$data"; \
-       export VIEW_FILE_NAME=$$data; \
+       export VIEW_GNU_FILE_NAME=$$data; \
        make gnuplot2D; \
        num=4; \
        data=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \
@@ -99,7 +99,7 @@ FNCGnuplot::
        do \
                export IN_GNU=$$data; \
                export OUT_GNU_FILE_NAME="$(FILE_NAME)-$$data"; \
-               export VIEW_FILE_NAME=$$data; \
+               export VIEW_GNU_FILE_NAME="$$data"; \
                make gnuplot2D; \
                num=`expr $$num + 2`; \
                data=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \

diff --git a/Small Tools/mrcImage/mrcImageROI3D/Makefile/Makefile b/Small Tools/mrcImage/mrcImageROI3D/Makefile/Makefile
index 2adf4de..c491d88 100644 (file)
--- a/Small Tools/mrcImage/mrcImageROI3D/Makefile/Makefile
+++ b/Small Tools/mrcImage/mrcImageROI3D/Makefile/Makefile
@@ -13,7 +13,9 @@ OUT=roi
 # Defined at Sub
 
 #### INCLUDE ####
+# Help-include-file must always be put on top.
 -include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
+-include ${EOS_HOME}/tutorial/TIPS/Debugger/Makefile/Makefile-lib
 -include Makefile-lib
 
 #### Definition ####

diff --git a/TIPS/Debugger/Makefile/Makefile-lib b/TIPS/Debugger/Makefile/Makefile-lib
index b20faaa..5337361 100644 (file)
--- a/TIPS/Debugger/Makefile/Makefile-lib
+++ b/TIPS/Debugger/Makefile/Makefile-lib
@@ -66,7 +66,7 @@ OpenToolsHeader::
        fi;
 
 RebuildTools::
-       dirc="$(TOOLS_PATH)$(TOOLS_CLASS)/$(TOOLS_COMMAND)/"; \
+       dirc="$(TOOLS_PATH)$(TOOLS_CLASS)/$(TOOLS_COMMAND)/src/"; \
        cd $$dirc; \
        if [ -d $$dirc ] ; then \
                make check; \

diff --git a/TIPS/Gnuplot/Makefile/Makefile-lib b/TIPS/Gnuplot/Makefile/Makefile-lib
index 7c654ae..2bc4c68 100644 (file)
--- a/TIPS/Gnuplot/Makefile/Makefile-lib
+++ b/TIPS/Gnuplot/Makefile/Makefile-lib
@@ -93,7 +93,7 @@ help_Gnuplot::
        @echo "         GNU_Y_SIZE:             output tiff size y"
        @echo "         GNU_Z_SIZE:             output tiff size z"
        @echo "         ====== Option ======"
-       @echo "         VIEW_FILE_NAME:         displayfile name on gnuplot."
+       @echo "         VIEW_GNU_FILE_NAME:             displayfile name on gnuplot."
        @echo
 
 ##### Commands(Input to Output) #####