r9647 - /1.3/specific_fns/n_state_model.py -- October 07, 2009 - 19:56

Author: bugman
Date: Wed Oct  7 19:56:59 2009
New Revision: 9647

URL: http://svn.gna.org/viewcvs/relax?rev=9647&view=rev
Log:
More fixes for the N-state model for the 'xh_vect' and 'bond_vect' mix up.


Modified:
    1.3/specific_fns/n_state_model.py

Modified: 1.3/specific_fns/n_state_model.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/n_state_model.py?rev=9647&r1=9646&r2=9647&view=diff
==============================================================================
--- 1.3/specific_fns/n_state_model.py (original)
+++ 1.3/specific_fns/n_state_model.py Wed Oct  7 19:56:59 2009
@@ -413,7 +413,7 @@
                     spin.pcs_bc[i] = model.deltaij_theta[i, data_index] * 1e6
 
                 # Spins with RDC data.
-                if hasattr(spin, 'rdc') and hasattr(spin, 'xh_vect'):
+                if hasattr(spin, 'rdc') and (hasattr(spin, 'xh_vect') or 
hasattr(spin, 'bond_vect')):
                     # Initialise the data structure if necessary.
                     if not hasattr(spin, 'rdc_bc'):
                         spin.rdc_bc = [None] * model.num_align
@@ -422,7 +422,7 @@
                     spin.rdc_bc[i] = model.Dij_theta[i, data_index]
 
                 # Increment the spin index if it contains data.
-                if hasattr(spin, 'pcs') or (hasattr(spin, 'rdc') and 
hasattr(spin, 'xh_vect')):
+                if hasattr(spin, 'pcs') or (hasattr(spin, 'rdc') and 
(hasattr(spin, 'xh_vect') or hasattr(spin, 'bond_vect'))):
                     data_index = data_index + 1