This repository is a base of Eos.
リビジョン | 5c1f42ca335d6b8bd455b339b664d13907e71638 (tree) |
---|---|
日時 | 2014-11-22 08:10:28 |
作者 | Takuo Yasunaga <yasunaga@bio....> |
コミッター | Takuo Yasunaga |
modified: src/Tools/mrcImage/mrcImageShrink/src/test/Makefile
@@ -3,28 +3,17 @@ include ../../../Config/Define.inc | ||
3 | 3 | include ../../../../Config/Define.inc |
4 | 4 | include ../../../../../Config/Define.inc |
5 | 5 | |
6 | -<<<<<<< HEAD | |
7 | -all: help exec | |
8 | - | |
9 | -======= | |
10 | 6 | NAME=data/121p |
11 | 7 | |
12 | 8 | all: help exec |
13 | 9 | |
14 | 10 | |
15 | ->>>>>>> FETCH_HEAD | |
16 | 11 | help: |
17 | 12 | @echo "----- Help Message Check -----" |
18 | 13 | @../$(OSTYPE)/$(OBJECTNAME) -h |
19 | 14 | |
20 | 15 | exec: |
21 | 16 | @echo "----- Execution Check -----" |
22 | -<<<<<<< HEAD | |
23 | - ../$(OSTYPE)/$(OBJECTNAME) | |
24 | - @echo "----- Calc check -----" | |
25 | - | |
26 | -clean: | |
27 | -======= | |
28 | 17 | ../$(OSTYPE)/$(OBJECTNAME) -i $(NAME).mrc3d -o $(NAME).mrc3d.shrink -S 4 |
29 | 18 | ../$(OSTYPE)/$(OBJECTNAME) -i $(NAME).mrc2d -o $(NAME).mrc2d.shrink -S 4 |
30 | 19 | @echo "----- Calc check -----" |
@@ -34,4 +23,3 @@ clean: | ||
34 | 23 | init: |
35 | 24 | pdb2mrc -i $(NAME).pdb -o $(NAME).mrc3d -nx 64 -ny 64 -nz 64 -Sx -32 -Sy -32 -Sz -32 -dx 1 -dy 1 -dz 1 -w 1 -sig 2.6 -m 0 |
36 | 25 | pdb2mrc2d -i $(NAME).pdb -o $(NAME).mrc2d -d 1 1 -s -32 -32 -n 64 64 -w 1.0 -sig 2.6 -Rot 1 1 |
37 | ->>>>>>> FETCH_HEAD |