r7112 - /branches/rdc_analysis/specific_fns/n_state_model.py -- August 08, 2008 - 11:05

Author: bugman
Date: Fri Aug  8 10:36:22 2008
New Revision: 7112

URL: http://svn.gna.org/viewcvs/relax?rev=7112&view=rev
Log:
Fixed __base_data_types() to properly identify tensors as the base data 
source.


Modified:
    branches/rdc_analysis/specific_fns/n_state_model.py

Modified: branches/rdc_analysis/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/specific_fns/n_state_model.py?rev=7112&r1=7111&r2=7112&view=diff
==============================================================================
--- branches/rdc_analysis/specific_fns/n_state_model.py (original)
+++ branches/rdc_analysis/specific_fns/n_state_model.py Fri Aug  8 10:36:22 
2008
@@ -175,12 +175,8 @@
                 break
 
         # Alignment tensor search.
-        if hasattr(ds[ds.current_pipe], 'align_tensors'):
+        if not ('rdc' in list or 'pcs' in list) and 
hasattr(ds[ds.current_pipe], 'align_tensors'):
             list.append('tensor')
-
-        # Can't have RDC or PCS data together with tensors as the base data.
-        if ('rdc' in list or 'pcs' in list) and 'tensor' in list:
-            raise RelaxError, "Cannot have RDC or PCS data together with 
tensors as the base data."
 
         # No data is present.
         if not list: