r6906 - /branches/rdc_analysis/specific_fns/n_state_model.py -- July 09, 2008 - 18:26

Author: bugman
Date: Wed Jul  9 18:26:09 2008
New Revision: 6906

URL: http://svn.gna.org/viewcvs/relax?rev=6906&view=rev
Log:
Complete change of the __determine_data_type() method.

The alignment tensors should be present when RDCs are loaded - they are part 
of the optimised model!


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=6906&r1=6905&r2=6906&view=diff
==============================================================================
--- branches/rdc_analysis/specific_fns/n_state_model.py (original)
+++ branches/rdc_analysis/specific_fns/n_state_model.py Wed Jul  9 18:26:09 
2008
@@ -114,15 +114,17 @@
                 rdc_flag = True
                 break
 
-        # Ok, have no idea what to do, so complain.
+        # RDCs are present, so it is assumed that the alignment tensors 
tensor will be optimised.
         if tensor_flag and rdc_flag:
-            raise RelaxError, "Both RDCs and alignment tensors are present.  
Cannot determine the data type to be used for the analysis." 
-
-        # Return the data type.
+            return 'rdc'
+
+        # No RDCs are present, so the tensors are the base data.
         if tensor_flag:
             return 'tensor'
+
+        # No data is present.
         else:
-            return 'rdc'
+            raise RelaxError, "Neither RDC nor alignment tensor data is 
present." 
 
 
     def assemble_param_vector(self, sim_index=None):