Author: bugman
Date: Tue May 7 16:25:22 2013
New Revision: 19672
URL: http://svn.gna.org/viewcvs/relax?rev=19672&view=rev
Log:
Merged revisions 19662,19671 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r19662 | bugman | 2013-05-06 09:46:58 +0200 (Mon, 06 May 2013) | 5 lines
Fixes for the dasha.extract user function for the changes to the
pipe_control.value.set function.
The values and errors are now set separately.
........
r19671 | bugman | 2013-05-07 16:23:19 +0200 (Tue, 07 May 2013) | 5 lines
The internal structural object PDF file creation now writes out
http://www.nmr-relax.com.
Previously the link http://nmr-relax.com was written out.
........
Modified:
branches/relax_disp/ (props changed)
branches/relax_disp/lib/structure/internal/object.py
branches/relax_disp/pipe_control/dasha.py
branches/relax_disp/test_suite/system_tests/structure.py
Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue May 7 16:25:22 2013
@@ -1,1 +1,1 @@
-/trunk:1-19655
+/trunk:1-19671
Modified: branches/relax_disp/lib/structure/internal/object.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/structure/internal/object.py?rev=19672&r1=19671&r2=19672&view=diff
==============================================================================
--- branches/relax_disp/lib/structure/internal/object.py (original)
+++ branches/relax_disp/lib/structure/internal/object.py Tue May 7 16:25:22
2013
@@ -2255,7 +2255,7 @@
# Write some initial remarks.
print("REMARK")
pdb_write.remark(file, num=4, remark="This file complies with format
v. 3.30, Jul-2011.")
- pdb_write.remark(file, num=40, remark="Created by relax
(http://nmr-relax.com).")
+ pdb_write.remark(file, num=40, remark="Created by relax
(http://www.nmr-relax.com).")
num_remark = 2
# Determine if model records will be created.
Modified: branches/relax_disp/pipe_control/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/pipe_control/dasha.py?rev=19672&r1=19671&r2=19672&view=diff
==============================================================================
--- branches/relax_disp/pipe_control/dasha.py (original)
+++ branches/relax_disp/pipe_control/dasha.py Tue May 7 16:25:22 2013
@@ -512,7 +512,8 @@
# Set the values.
for i in range(len(data)):
- value.set(val=data[i][1], error=data[i][0], param=param,
spin_id=data[i][0])
+ value.set(val=data[i][1], param=param, spin_id=data[i][0])
+ value.set(val=data[i][0], param=param, spin_id=data[i][0],
error=True)
# Clean up of non-existent parameters (set the parameter to None!).
for spin in spin_loop():
Modified: branches/relax_disp/test_suite/system_tests/structure.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/structure.py?rev=19672&r1=19671&r2=19672&view=diff
==============================================================================
--- branches/relax_disp/test_suite/system_tests/structure.py (original)
+++ branches/relax_disp/test_suite/system_tests/structure.py Tue May 7
16:25:22 2013
@@ -649,7 +649,7 @@
# What the contents should be.
real_data = [
"REMARK 4 THIS FILE COMPLIES WITH FORMAT V. 3.30, JUL-2011.
\n",
- "REMARK 40 CREATED BY RELAX (HTTP://NMR-RELAX.COM).
\n",
+ "REMARK 40 CREATED BY RELAX (HTTP://WWW.NMR-RELAX.COM).
\n",
"HELIX 1 H1 ILE A 23 GLU A 34 1
12 \n",
"SHEET 1 BET 5 GLY A 10 VAL A 17 0
\n",
"SHEET 2 BET 5 MET A 1 THR A 7 -1
\n",
@@ -1166,7 +1166,7 @@
# The result.
result = [
"REMARK 4 THIS FILE COMPLIES WITH FORMAT V. 3.30, JUL-2011.
",
- "REMARK 40 CREATED BY RELAX (HTTP://NMR-RELAX.COM).
",
+ "REMARK 40 CREATED BY RELAX (HTTP://WWW.NMR-RELAX.COM).
",
"ATOM 1 N LEU 4 9.464 -9.232 27.573 1.00
0.00 N ",
"ATOM 2 N LEU 4 9.211 -9.425 26.970 1.00
0.00 N ",
"ATOM 3 H LEU 4 8.575 -8.953 27.963 1.00
0.00 H ",
@@ -1224,7 +1224,7 @@
# The result.
result = [
"REMARK 4 THIS FILE COMPLIES WITH FORMAT V. 3.30, JUL-2011.
",
- "REMARK 40 CREATED BY RELAX (HTTP://NMR-RELAX.COM).
",
+ "REMARK 40 CREATED BY RELAX (HTTP://WWW.NMR-RELAX.COM).
",
"ATOM 1 N LEU 4 9.464 -9.232 27.573 1.00
0.00 N ",
"ATOM 2 N LEU 4 7.761 -6.392 27.161 1.00
0.00 N ",
"ATOM 3 H LEU 4 8.575 -8.953 27.963 1.00
0.00 H ",
@@ -1282,7 +1282,7 @@
# The result.
result = [
"REMARK 4 THIS FILE COMPLIES WITH FORMAT V. 3.30, JUL-2011.
",
- "REMARK 40 CREATED BY RELAX (HTTP://NMR-RELAX.COM).
",
+ "REMARK 40 CREATED BY RELAX (HTTP://WWW.NMR-RELAX.COM).
",
"ATOM 1 N LEU 4 9.464 -9.232 27.573 1.00
0.00 N ",
"ATOM 2 N LEU 4 9.211 -9.425 26.970 1.00
0.00 N ",
"ATOM 3 N LEU 4 7.761 -6.392 27.161 1.00
0.00 N ",
r19672 - in /branches/relax_disp: ./ lib/structure/internal/ pipe_control/ test_suite/system_tests/