r8716 - /branches/ave_noe/specific_fns/n_state_model.py -- February 02, 2009 - 11:05

Author: bugman
Date: Mon Feb  2 11:05:21 2009
New Revision: 8716

URL: http://svn.gna.org/viewcvs/relax?rev=8716&view=rev
Log:
Modified __base_data_types() to include NOE restraints.


Modified:
    branches/ave_noe/specific_fns/n_state_model.py

Modified: branches/ave_noe/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/ave_noe/specific_fns/n_state_model.py?rev=8716&r1=8715&r2=8716&view=diff
==============================================================================
--- branches/ave_noe/specific_fns/n_state_model.py (original)
+++ branches/ave_noe/specific_fns/n_state_model.py Mon Feb  2 11:05:21 2009
@@ -163,7 +163,13 @@
     def __base_data_types(self):
         """Determine all the base data types.
 
-        @return:    A list of all the base data types.  This can include 
'rdc', 'pcs', and 'tensor'.
+        The base data types can include::
+            - 'rdc', residual dipolar couplings.
+            - 'pcs', pseudo-contact shifts.
+            - 'noesy', NOE restraints.
+            - 'tensor', alignment tensors.
+
+        @return:    A list of all the base data types.
         @rtype:     list of str
         """
 
@@ -189,9 +195,13 @@
         if not ('rdc' in list or 'pcs' in list) and hasattr(cdp, 
'align_tensors'):
             list.append('tensor')
 
+        # NOESY data search.
+        if hasattr(cdp, 'noe_restraints'):
+            list.append('noesy')
+
         # No data is present.
         if not list:
-            raise RelaxError, "Neither RDC, PCS, nor alignment tensor data 
is present."
+            raise RelaxError, "Neither RDC, PCS, NOESY nor alignment tensor 
data is present."
 
         # Return the list.
         return list