• R/O
  • HTTP
  • SSH
  • HTTPS

tutorial: Commit

This repository is for tutorials of Eos.


Commit MetaInfo

Revisione2c6f427d9bce5118c7971de9dd8e172f8e00e25 (tree)
Time2014-10-22 17:47:18
Authorkinoshita-eos <kinoshita@yasu...>
Commiterkinoshita-eos

Log Message

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

Change Summary

Incremental Difference

--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile
@@ -44,8 +44,8 @@ MASK_SIZE_Z=256
4444 # FNC Graph Image
4545 X_SIZE_GRAPH=360
4646 Y_SIZE_GRAPH=240
47-S_DATA=11
48-E_DATA=11
47+S_DATA=1
48+E_DATA=1
4949
5050 #### Rules of the list created ####
5151 # Defined at Sub
@@ -97,6 +97,6 @@ help_mrcImageFourierNeighborCorrelation::
9797 ##### Commands(Input to Output) #####
9898 # Defined at Sub
9999 .$(MASK).$(FNC):
100- mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FNC) \
100+ mrcImageFourierNeighborCorrelation -i $*.$(INI)pad -o $*.$(FNC) -d 0.025 \
101101 -FSC -mask $*.$(MASK) -maskBack $*.$(MASKBACK) \
102- -NoiseWeighted 10 -FSCfull -Cref;
102+ -NoiseWeighted -100 -FSCfull -Cref;
--- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
+++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib
@@ -91,7 +91,7 @@ FNCGnuplot::
9191 data=FNC; \
9292 export IN_GNU=$$data; \
9393 export OUT_GNU_FILE_NAME="$(FILE_NAME)-$$data"; \
94- export VIEW_FILE_NAME=$$data; \
94+ export VIEW_GNU_FILE_NAME=$$data; \
9595 make gnuplot2D; \
9696 num=4; \
9797 data=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \
@@ -99,7 +99,7 @@ FNCGnuplot::
9999 do \
100100 export IN_GNU=$$data; \
101101 export OUT_GNU_FILE_NAME="$(FILE_NAME)-$$data"; \
102- export VIEW_FILE_NAME=$$data; \
102+ export VIEW_GNU_FILE_NAME="$$data"; \
103103 make gnuplot2D; \
104104 num=`expr $$num + 2`; \
105105 data=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \
--- a/Small Tools/mrcImage/mrcImageROI3D/Makefile/Makefile
+++ b/Small Tools/mrcImage/mrcImageROI3D/Makefile/Makefile
@@ -13,7 +13,9 @@ OUT=roi
1313 # Defined at Sub
1414
1515 #### INCLUDE ####
16+# Help-include-file must always be put on top.
1617 -include ${EOS_HOME}/tutorial/TIPS/Help/Makefile/Makefile-lib
18+-include ${EOS_HOME}/tutorial/TIPS/Debugger/Makefile/Makefile-lib
1719 -include Makefile-lib
1820
1921 #### Definition ####
--- a/TIPS/Debugger/Makefile/Makefile-lib
+++ b/TIPS/Debugger/Makefile/Makefile-lib
@@ -66,7 +66,7 @@ OpenToolsHeader::
6666 fi;
6767
6868 RebuildTools::
69- dirc="$(TOOLS_PATH)$(TOOLS_CLASS)/$(TOOLS_COMMAND)/"; \
69+ dirc="$(TOOLS_PATH)$(TOOLS_CLASS)/$(TOOLS_COMMAND)/src/"; \
7070 cd $$dirc; \
7171 if [ -d $$dirc ] ; then \
7272 make check; \
--- a/TIPS/Gnuplot/Makefile/Makefile-lib
+++ b/TIPS/Gnuplot/Makefile/Makefile-lib
@@ -93,7 +93,7 @@ help_Gnuplot::
9393 @echo " GNU_Y_SIZE: output tiff size y"
9494 @echo " GNU_Z_SIZE: output tiff size z"
9595 @echo " ====== Option ======"
96- @echo " VIEW_FILE_NAME: displayfile name on gnuplot."
96+ @echo " VIEW_GNU_FILE_NAME: displayfile name on gnuplot."
9797 @echo
9898
9999 ##### Commands(Input to Output) #####
Show on old repository browser