r18435 - in /branches/frame_order_testing: ./ info.py test_suite/system_tests/pcs.py -- February 07, 2013 - 14:56

Author: bugman
Date: Thu Feb  7 14:56:29 2013
New Revision: 18435

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

........
  r18430 | bugman | 2013-02-06 12:09:38 +0100 (Wed, 06 Feb 2013) | 5 lines
  
  The relax program introduction now includes the revision number for 
subversion checked out copied.
  
  This allows for better identification of the code base being used.
........
  r18432 | bugman | 2013-02-07 13:53:50 +0100 (Thu, 07 Feb 2013) | 6 lines
  
  Fixes for the Pcs.test_structural_noise system test.
  
  As this is based on random functions, sometimes, though rarely, the test 
fails.  Now the simulation
  accuracy has been increased and the tests are less rigorous.
........

Modified:
    branches/frame_order_testing/   (props changed)
    branches/frame_order_testing/info.py
    branches/frame_order_testing/test_suite/system_tests/pcs.py

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu Feb  7 14:56:29 2013
@@ -1,1 +1,1 @@
-/trunk:1-18428
+/trunk:1-18434

Modified: branches/frame_order_testing/info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/info.py?rev=18435&r1=18434&r2=18435&view=diff
==============================================================================
--- branches/frame_order_testing/info.py (original)
+++ branches/frame_order_testing/info.py Thu Feb  7 14:56:29 2013
@@ -47,7 +47,7 @@
 
 # relax module imports.
 from status import Status; status = Status()
-from version import version, version_full
+from version import revision, version, version_full
 
 
 class Info_box(object):
@@ -271,7 +271,11 @@
         intro_string = '\n\n\n'
 
         # Program name and version.
-        intro_string = intro_string + self.centre(self.title + ' ' + 
self.version, status.text_width) + '\n\n'
+        if version == 'repository checkout':
+            text = "%s %s r%s" % (self.title, self.version, revision())
+        else:
+            text = "%s %s" % (self.title, self.version)
+        intro_string = intro_string + self.centre(text, status.text_width) + 
'\n\n'
 
         # Program description.
         intro_string = intro_string + self.centre(self.desc, 
status.text_width) + '\n\n'

Modified: branches/frame_order_testing/test_suite/system_tests/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/pcs.py?rev=18435&r1=18434&r2=18435&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/pcs.py (original)
+++ branches/frame_order_testing/test_suite/system_tests/pcs.py Thu Feb  7 
14:56:29 2013
@@ -263,7 +263,7 @@
 
         # Structural noise (twice to make sure old errors are removed 
properly from the PCS error).
         self.interpreter.pcs.structural_noise(rmsd=200.0, sim_num=100, 
file='devnull', dir=None, force=True)
-        self.interpreter.pcs.structural_noise(rmsd=0.2, sim_num=10000, 
file='devnull', dir=None, force=True)
+        self.interpreter.pcs.structural_noise(rmsd=0.2, sim_num=20000, 
file='devnull', dir=None, force=True)
 
         # The simulated data (from 1,000,000 randomisations of 0.2 Angstrom 
RMSD).
         pcs_struct_err = {
@@ -284,5 +284,5 @@
 
         # Test the PCS data.
         for id in ['Dy N-dom', 'Tb N-dom', 'Tm N-dom', 'Er N-dom']:
-            self.assertAlmostEqual(spin.pcs_struct_err[id], 
pcs_struct_err[id], 3)
-            self.assertAlmostEqual(spin.pcs_err[id], pcs_err[id], 3)
+            self.assertAlmostEqual(spin.pcs_struct_err[id], 
pcs_struct_err[id], 2)
+            self.assertAlmostEqual(spin.pcs_err[id], pcs_err[id], 2)