r26201 - in /branches/frame_order_cleanup: ./ test_suite/system_tests/relax_disp.py -- October 08, 2014 - 08:39

Author: bugman
Date: Wed Oct  8 08:38:58 2014
New Revision: 26201

URL: http://svn.gna.org/viewcvs/relax?rev=26201&view=rev
Log:
Merged revisions 26188 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r26188 | tlinnet | 2014-10-07 15:45:32 +0200 (Tue, 07 Oct 2014) | 3 lines
  
  Epydoc change for DOI reference in systemtests.
  
  Bug #22754 (https://gna.org/bugs/index.php?22754): The minimise.calculate() 
does not calculate chi2 value for clustered residues.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct  8 08:38:58 2014
@@ -1 +1 @@
-/trunk:1-26139,26142-26176
+/trunk:1-26139,26142-26176,26188

Modified: branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py?rev=26201&r1=26200&r2=26201&view=diff
==============================================================================
--- branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  
(original)
+++ branches/frame_order_cleanup/test_suite/system_tests/relax_disp.py  Wed 
Oct  8 08:38:58 2014
@@ -1228,10 +1228,9 @@
     def x_test_bmrb_sub_cpmg(self):
         """U{Task #7858: <https://gna.org/task/?7858>} Make it possible to 
submit CPMG experiments for BMRB.
         This uses CPMG data from:
-
-            Webb H, Tynan-Connolly BM, Lee GM, Farrell D, O'Meara F, 
Soendergaard CR, Teilum K, Hewage C, McIntosh LP, Nielsen JE
-            Remeasuring HEWL pK(a) values by NMR spectroscopy: methods, 
analysis, accuracy, and implications for theoretical pK(a) calculations.
-            (2011), Proteins: Struct, Funct, Bioinf 79(3):685-702, DOI 
10.1002/prot.22886
+            - Webb H, Tynan-Connolly BM, Lee GM, Farrell D, O'Meara F, 
Soendergaard CR, Teilum K, Hewage C, McIntosh LP, Nielsen JE.
+              Remeasuring HEWL pK(a) values by NMR spectroscopy: methods, 
analysis, accuracy, and implications for theoretical pK(a) calculations.
+              (2011), Proteins: Struct, Funct, Bioinf 79(3):685-702, DOI 
10.1002/prot.22886
         """
 
         # Define path to data 
@@ -2991,8 +2990,8 @@
 
         This uses CPMG data from:
             - Webb H, Tynan-Connolly BM, Lee GM, Farrell D, O'Meara F, 
Soendergaard CR, Teilum K, Hewage C, McIntosh LP, Nielsen JE
-            - Remeasuring HEWL pK(a) values by NMR spectroscopy: methods, 
analysis, accuracy, and implications for theoretical pK(a) calculations.
-            - (2011), Proteins: Struct, Funct, Bioinf 79(3):685-702, U{DOI 
10.1002/prot.22886<http://dx.doi.org/10.1002/prot.22886>}
+              Remeasuring HEWL pK(a) values by NMR spectroscopy: methods, 
analysis, accuracy, and implications for theoretical pK(a) calculations.
+              (2011), Proteins: Struct, Funct, Bioinf 79(3):685-702, U{DOI 
10.1002/prot.22886<http://dx.doi.org/10.1002/prot.22886>}
         """
 
         # Define path to data