r20124 - in /branches/relax_disp: ./ specific_analyses/n_state_model/__init__.py -- June 14, 2013 - 17:37

Author: bugman
Date: Fri Jun 14 17:37:22 2013
New Revision: 20124

URL: http://svn.gna.org/viewcvs/relax?rev=20124&view=rev
Log:
Merged revisions 20123 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r20123 | bugman | 2013-06-14 17:37:05 +0200 (Fri, 14 Jun 2013) | 3 lines
  
  Another fix similar to that of r20120, this time for the 
_minimise_setup_rdcs() method.
........

Modified:
    branches/relax_disp/   (props changed)
    branches/relax_disp/specific_analyses/n_state_model/__init__.py

Propchange: branches/relax_disp/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jun 14 17:37:22 2013
@@ -1,1 +1,1 @@
-/trunk:1-20121
+/trunk:1-20123

Modified: branches/relax_disp/specific_analyses/n_state_model/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/n_state_model/__init__.py?rev=20124&r1=20123&r2=20124&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/n_state_model/__init__.py (original)
+++ branches/relax_disp/specific_analyses/n_state_model/__init__.py Fri Jun 
14 17:37:22 2013
@@ -588,7 +588,7 @@
                     continue
 
                 # Check for J couplings if the RDC data type is T = J+D.
-                if cdp.rdc_data_types[align_id] == 'T' and not 
hasattr(interatom, 'j_coupling'):
+                if align_id in cdp.rdc_data_types and 
cdp.rdc_data_types[align_id] == 'T' and not hasattr(interatom, 'j_coupling'):
                     continue
 
                 # Defaults of None.