r17200 - in /branches/frame_order_testing: ./ test_suite/system_tests/palmer.py -- July 04, 2012 - 12:50

Author: bugman
Date: Wed Jul  4 12:50:22 2012
New Revision: 17200

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

........
  r17174 | bugman | 2012-07-04 09:32:35 +0200 (Wed, 04 Jul 2012) | 5 lines
  
  Bug fix for the Palmer system tests for the changed spin ID syntax.
  
  The spin Gly 2 can no longer be selected with ':2&:Gly', the '&' symbol is 
not allowed here.
........

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

Propchange: branches/frame_order_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul  4 12:50:22 2012
@@ -1,1 +1,1 @@
-/trunk:1-17117,17139-17142,17156
+/trunk:1-17117,17139-17142,17156,17174

Modified: branches/frame_order_testing/test_suite/system_tests/palmer.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/palmer.py?rev=17200&r1=17199&r2=17200&view=diff
==============================================================================
--- branches/frame_order_testing/test_suite/system_tests/palmer.py (original)
+++ branches/frame_order_testing/test_suite/system_tests/palmer.py Wed Jul  4 
12:50:22 2012
@@ -68,7 +68,7 @@
         # Checks for model m1, m2, and m3 mfout file reading.
         models = ['m1', 'm2', 'm3']
         params = [['s2'], ['s2', 'te'], ['s2', 'rex']]
-        spin_names = [':-2&:Gly', ':-1&:Gly', ':0&:Gly']
+        spin_names = [':-2', ':-1', ':0']
         if compiler == 'gcc':
             s2 = [[0.869, 0.732, None], [0.869, 0.730, None], [0.715, 0.643, 
None]]
             te = [[None, None, None], [0.0, 1.951, None], [None, None, 
None]]    # Gnu gcc modelfree4 version.