From 1fe9ec5dee16e2503fd2f7112feb4b596df669bf Mon Sep 17 00:00:00 2001 From: kinoshita-eos Date: Wed, 22 Oct 2014 10:57:22 +0900 Subject: [PATCH] Modify: Support the graph for all option. modified: Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib --- .../Makefile/Makefile-lib | 32 +++++++++++++--------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib index 49e15fd..5a4aef6 100644 --- a/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib +++ b/Small Tools/mrcImage/mrcImageFourierNeighborCorrelation/Makefile/Makefile-lib @@ -73,30 +73,36 @@ FNCGnudata:: export OUT_ASCII=FNC; \ export ASCII_CLMN="1 2"; \ make ExtractColumn; \ - export OUT_ASCII=FSC; \ - export ASCII_CLMN="1 5"; \ - make ExtractColumn; \ - export OUT_ASCII=SNR; \ - export ASCII_CLMN="1 7"; \ - make ExtractColumn; \ - export OUT_ASCII=FNCF; \ - export ASCII_CLMN="1 9"; \ - make ExtractColumn; \ - export OUT_ASCII=FNCN; \ - export ASCII_CLMN="1 11"; \ - make ExtractColumn; + num=4; \ + OUT_ASCII=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \ + while [ ! -z "$$OUT_ASCII" ] ; \ + do \ + export ASCII_CLMN="1 `expr $$num + 1`"; \ + make ExtractColumn; \ + num=`expr $$num + 2`; \ + OUT_ASCII=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \ + done; FNCGnuplot:: export IN_GNU_FILE_NAME=$(FILE_NAME); \ export OUT_GNU=png; \ export GNU_X_SIZE=$(X_SIZE_GRAPH); \ export GNU_Y_SIZE=$(Y_SIZE_GRAPH); \ - for data in FNC FSC SNR FNCF FNCN ; \ + data=FNC; \ + export IN_GNU=$$data; \ + export OUT_GNU_FILE_NAME="$(FILE_NAME)-$$data"; \ + export VIEW_FILE_NAME=$$data; \ + make gnuplot2D; \ + num=4; \ + data=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \ + while [ ! -z "$$data" ] ; \ do \ export IN_GNU=$$data; \ export OUT_GNU_FILE_NAME="$(FILE_NAME)-$$data"; \ export VIEW_FILE_NAME=$$data; \ make gnuplot2D; \ + num=`expr $$num + 2`; \ + data=$$(head -1 $(FILE_NAME).cut | awk -v v=$$num '{printf("%s", $$v)}'); \ done; ##### Commands(Input to Output) ##### -- 2.11.0