r4872 - /branches/N_state_model/specific_fns/n_state_model.py -- January 21, 2008 - 15:17

Author: bugman
Date: Mon Jan 21 15:17:42 2008
New Revision: 4872

URL: http://svn.gna.org/viewcvs/relax?rev=4872&view=rev
Log:
Fix for the return_data_name() method.

The probability structure is called 'probs'.  The docstring has been updated 
as well to reflect the
real object names.


Modified:
    branches/N_state_model/specific_fns/n_state_model.py

Modified: branches/N_state_model/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/n_state_model.py?rev=4872&r1=4871&r2=4872&view=diff
==============================================================================
--- branches/N_state_model/specific_fns/n_state_model.py (original)
+++ branches/N_state_model/specific_fns/n_state_model.py Mon Jan 21 15:17:42 
2008
@@ -521,15 +521,17 @@
         | Data type              | Object name                 | Patterns    
                      |
         
|________________________|_____________________________|___________________________________|
         |                        |                             |             
                      |
-        | Probabilities          | 'p0', 'p1', 'p2', ..., 'pN' | 'p0', 'p1', 
'p2', ..., 'pN'       |
+        | Probabilities          | 'probs'                     | 'p0', 'p1', 
'p2', ..., 'pN'       |
         |                        |                             |             
                      |
-        | Euler angle alpha      | 'alpha0', 'alpha1', ...     | 'alpha0', 
'alpha1', ...           |
+        | Euler angle alpha      | 'alpha'                     | 'alpha0', 
'alpha1', ...           |
         |                        |                             |             
                      |
-        | Euler angle beta       | 'beta0', 'beta1', ...       | 'beta0', 
'beta1', ...             |
+        | Euler angle beta       | 'beta'                      | 'beta0', 
'beta1', ...             |
         |                        |                             |             
                      |
-        | Euler angle gamma      | 'gamma0', 'gamma1', ...     | 'gamma0', 
'gamma1', ...           |
+        | Euler angle gamma      | 'gamma'                     | 'gamma0', 
'gamma1', ...           |
         
|________________________|_____________________________|___________________________________|
 
+        The objects corresponding to the object names are lists (or arrays) 
with each element
+        corrsponding to each state.
         """
         __docformat__ = "plaintext"
 
@@ -543,9 +545,9 @@
 
             # Return the name (and maybe index).
             if index:
-                return 'p', i
+                return 'probs', i
             else:
-                return 'p'
+                return 'probs'
 
         # Alpha Euler angle.
         if search('^alpha', name):