r11155 - in /1.3/generic_fns: pcs.py rdc.py -- April 27, 2010 - 17:59

Author: bugman
Date: Tue Apr 27 17:59:14 2010
New Revision: 11155

URL: http://svn.gna.org/viewcvs/relax?rev=11155&view=rev
Log:
Fixed the Q-factor calculating functions to handle missing RDC or PCS lists.


Modified:
    1.3/generic_fns/pcs.py
    1.3/generic_fns/rdc.py

Modified: 1.3/generic_fns/pcs.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/pcs.py?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- 1.3/generic_fns/pcs.py (original)
+++ 1.3/generic_fns/pcs.py Tue Apr 27 17:59:14 2010
@@ -172,7 +172,7 @@
                 pcs_bc_data = True
 
             # Skip spins without PCS data.
-            if not hasattr(spin, 'pcs') or not hasattr(spin, 'pcs_bc') or 
spin.pcs[align_id] == None:
+            if not hasattr(spin, 'pcs') or not hasattr(spin, 'pcs_bc') or 
align_id not in spin.pcs.keys() or spin.pcs[align_id] == None:
                 continue
 
             # Sum of squares.

Modified: 1.3/generic_fns/rdc.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/rdc.py?rev=11155&r1=11154&r2=11155&view=diff
==============================================================================
--- 1.3/generic_fns/rdc.py (original)
+++ 1.3/generic_fns/rdc.py Tue Apr 27 17:59:14 2010
@@ -131,7 +131,7 @@
                 rdc_bc_data = True
 
             # Skip spins without RDC data.
-            if not hasattr(spin, 'rdc') or not hasattr(spin, 'rdc_bc') or 
spin.rdc[align_id] == None:
+            if not hasattr(spin, 'rdc') or not hasattr(spin, 'rdc_bc') or 
align_id not in spin.rdc.keys() or spin.rdc[align_id] == None:
                 continue
 
             # Sum of squares.