r20144 - /trunk/pipe_control/rdc.py -- June 16, 2013 - 13:36

Author: bugman
Date: Sun Jun 16 13:36:37 2013
New Revision: 20144

URL: http://svn.gna.org/viewcvs/relax?rev=20144&view=rev
Log:
Fixes for the pipe_control.rdc module for when the structure 
cdp.rdc_data_types is missing.


Modified:
    trunk/pipe_control/rdc.py

Modified: trunk/pipe_control/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/pipe_control/rdc.py?rev=20144&r1=20143&r2=20144&view=diff
==============================================================================
--- trunk/pipe_control/rdc.py (original)
+++ trunk/pipe_control/rdc.py Sun Jun 16 13:36:37 2013
@@ -120,7 +120,7 @@
             interatom.rdc_bc[id] = ave_rdc_tensor(dj, unit_vect, cdp.N, 
cdp.align_tensors[get_tensor_index(align_id=id)].A, weights=weights)
 
             # T values.
-            if align_id in cdp.rdc_data_types and 
cdp.rdc_data_types[align_id] == 'T':
+            if hasattr(cdp, 'rdc_data_types') and align_id in 
cdp.rdc_data_types and cdp.rdc_data_types[align_id] == 'T':
                 if not hasattr(interatom, 'j_coupling'):
                     raise RelaxNoJError
 
@@ -476,7 +476,7 @@
             if hasattr(interatom, 'rdc_bc') and align_id in interatom.rdc_bc:
                 rdc_bc_data = True
             j_flag = False
-            if align_id in cdp.rdc_data_types and 
cdp.rdc_data_types[align_id] == 'T':
+            if hasattr(cdp, 'rdc_data_types') and align_id in 
cdp.rdc_data_types and cdp.rdc_data_types[align_id] == 'T':
                 j_flag = True
                 if not hasattr(interatom, 'j_coupling'):
                     raise RelaxNoJError