r13920 - in /branches/gui_testing: ./ specific_fns/model_free/main.py -- July 27, 2011 - 09:38

Author: bugman
Date: Wed Jul 27 09:38:51 2011
New Revision: 13920

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

........
  r13919 | bugman | 2011-07-27 09:37:48 +0200 (Wed, 27 Jul 2011) | 3 lines
  
  The heteronucleus and proton type parameters can now be specified by their 
parameter names aas well.
........

Modified:
    branches/gui_testing/   (props changed)
    branches/gui_testing/specific_fns/model_free/main.py

Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jul 27 09:38:51 2011
@@ -1,1 +1,1 @@
-/1.3:1-13911
+/1.3:1-13919

Modified: branches/gui_testing/specific_fns/model_free/main.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/model_free/main.py?rev=13920&r1=13919&r2=13920&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/model_free/main.py (original)
+++ branches/gui_testing/specific_fns/model_free/main.py Wed Jul 27 09:38:51 
2011
@@ -2305,11 +2305,11 @@
             return 'csa'
 
         # Heteronucleus type.
-        if search('^[Hh]eteronucleus$', param):
+        if search('heteronuc_type', param) or search('^[Hh]eteronucleus$', 
param):
             return 'heteronuc_type'
 
         # Proton type.
-        if search('^[Pp]roton$', param):
+        if search('proton_type', param) or  search('^[Pp]roton$', param):
             return 'proton_type'