1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
|
diff --git a/ccp4i/scripts/check.script b/ccp4i/scripts/check.script
index def44bc..dd4bb7e 100755
--- a/ccp4i/scripts/check.script
+++ b/ccp4i/scripts/check.script
@@ -24,7 +24,7 @@
if $RUN_RAMPAGE {
# Generate command line
- set cmd "[BinPath rapper]"
+ set cmd "[BinPath rappermc]"
set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper]
set paramsfile [FileJoin $rapperdatadir params.xml]
diff --git a/ccp4i/scripts/rapper.script b/ccp4i/scripts/rapper.script
index cdae1e2..faae226 100755
--- a/ccp4i/scripts/rapper.script
+++ b/ccp4i/scripts/rapper.script
@@ -17,7 +17,7 @@
#set up command line
-set cmd "[BinPath rapper]"
+set cmd "[BinPath rappermc]"
set rapperdatadir [FileJoin [GetEnvPath CCP4] share rapper]
set paramsfile [FileJoin [GetEnvPath CCP4] share rapper params.xml]
@@ -180,7 +180,7 @@ append outfiles " $XYZOUT PROJECT"
# Run RAPPER to join loop back to framework and out put to defined pdb file
# Also need to sort out multimodel files join - FIX ME
-set cmd2 "[BinPath rapper]"
+set cmd2 "[BinPath rappermc]"
append cmd2 " $paramsfile joinpdb "
append cmd2 " --pdb2 \"$root\-loop.pdb\" "
append cmd2 " --pdb \"$root\-framework.pdb\" "
diff --git a/ccp4i/tasks/check.tcl b/ccp4i/tasks/check.tcl
index ae88ff2..ee3307b 100755
--- a/ccp4i/tasks/check.tcl
+++ b/ccp4i/tasks/check.tcl
@@ -46,7 +46,7 @@ proc check_run { arrayname } {
# Check for Rampage program. If it is not found, we switch off the option.
# If it was the only option, script will fail with next check.
if { $array(RUN_RAMPAGE) == 1 } {
- if { [FindExecutable "rapper"] == "" } {
+ if { [FindExecutable "rappermc"] == "" } {
WarningMessage "Input Error: Rapper_Rampage program not found in system path."
set array(RUN_RAMPAGE) 0
}
diff --git a/ccp4i/tasks/rapper.tcl b/ccp4i/tasks/rapper.tcl
index e299057..8843a3f 100755
--- a/ccp4i/tasks/rapper.tcl
+++ b/ccp4i/tasks/rapper.tcl
@@ -28,7 +28,7 @@ proc rapper_run { arrayname } {
# Check for RAPPER program. If it is not found, we switch off the option.
# If it was the only option, script will fail with next check.
if { [regexp MODEL $build_type ] && $prog_type == "RAPPER"} {
- if { [FindExecutable "rapper"] == "" } {
+ if { [FindExecutable "rappermc"] == "" } {
WarningMessage "Input Error: RAPPER program not found in system path."
set build_type 0
}
|
GitWeb
