r23792 - /branches/disp_spin_speed/lib/dispersion/cr72.py -- June 10, 2014 - 18:40

Author: tlinnet
Date: Tue Jun 10 18:40:59 2014
New Revision: 23792

URL: http://svn.gna.org/viewcvs/relax?rev=23792&view=rev
Log:
Fix for testing of pA in lib function, when pA is just float.

Task #7807 (https://gna.org/task/index.php?7807): Speed-up of dispersion 
models for Clustered analysis.

Modified:
    branches/disp_spin_speed/lib/dispersion/cr72.py

Modified: branches/disp_spin_speed/lib/dispersion/cr72.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/disp_spin_speed/lib/dispersion/cr72.py?rev=23792&r1=23791&r2=23792&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/cr72.py     (original)
+++ branches/disp_spin_speed/lib/dispersion/cr72.py     Tue Jun 10 18:40:59 
2014
@@ -146,14 +146,12 @@
             #mask_dw = ma.masked_values(dw, 0.0)
             back_calc[:] = r20a
             return
-            
-        # Test if pA is zero.
-        elif allclose(pA, ones(pA.shape), rtol=1e-07):
-            #mask_pA_t = True
-            #mask_pA = ma.masked_values(pA, 1.0)
-            back_calc[:] = r20a
-            return
-
+
+        # Test if pA is 1.
+        if pA == 1.0:
+            back_calc[:] = r20a
+            return            
+                                    
        # Test if kex is zero.       
         elif allclose(kex, zeros(kex.shape)):
             #mask_kex_t = True