r7084 - /branches/rdc_analysis/maths_fns/n_state_model.py -- August 08, 2008 - 06:12

Author: bugman
Date: Thu Aug  7 16:56:29 2008
New Revision: 7084

URL: http://svn.gna.org/viewcvs/relax?rev=7084&view=rev
Log:
Set up the rdc and pcs flags in the __init__() method.


Modified:
    branches/rdc_analysis/maths_fns/n_state_model.py

Modified: branches/rdc_analysis/maths_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/rdc_analysis/maths_fns/n_state_model.py?rev=7084&r1=7083&r2=7084&view=diff
==============================================================================
--- branches/rdc_analysis/maths_fns/n_state_model.py (original)
+++ branches/rdc_analysis/maths_fns/n_state_model.py Thu Aug  7 16:56:29 2008
@@ -134,18 +134,30 @@
 
         # The flexible population N-state model.
         elif model == 'population':
+            # Set the RDC and PCS flags (indicating the presence of data).
+            self.rdc_flag = True
+            self.pcs_flag = True
+            if rdcs == None:
+                self.rdc_flag = False
+            if pcs == None:
+                self.pcs_flag = False
+
             # Some checks.
             if xh_vect == None and not len(xh_vect):
                 raise RelaxError, "The xh_vect argument " + `xh_vect` + " 
must be supplied."
 
+            # No data?
+            if not self.rdc_flag and not self.pcs_flag:
+                raise RelaxError, "No RDC or PCS data has been supplied."
+
             # The total number of spins.
-            if rdcs != None:
+            if self.rdc_flag:
                 self.num_spins = len(rdcs[0])
             else:
                 self.num_spins = len(pcs[0])
 
             # The total number of alignments.
-            if rdcs != None:
+            if self.rdc_flag:
                 self.num_align = len(rdcs)
             else:
                 self.num_align = len(pcs)