r23795 - /branches/disp_spin_speed/lib/dispersion/cr72.py -- June 10, 2014 - 18:41

Author: tlinnet
Date: Tue Jun 10 18:41:05 2014
New Revision: 23795

URL: http://svn.gna.org/viewcvs/relax?rev=23795&view=rev
Log:
Fix for testing of kex in lib function, when kex 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=23795&r1=23794&r2=23795&view=diff
==============================================================================
--- branches/disp_spin_speed/lib/dispersion/cr72.py     (original)
+++ branches/disp_spin_speed/lib/dispersion/cr72.py     Tue Jun 10 18:41:05 
2014
@@ -140,6 +140,11 @@
             return
     # For higher dimensions, return same structure.
     else:
+       # Test if kex is zero.       
+        if kex == 1.0:
+            back_calc[:] = r20a
+            return
+
         # Test if dw is zero.
         if allclose(dw, zeros(dw.shape)):
             #mask_dw_t = True
@@ -151,13 +156,6 @@
         if pA == 1.0:
             back_calc[:] = r20a
             return            
-                                    
-       # Test if kex is zero.       
-        elif allclose(kex, zeros(kex.shape)):
-            #mask_kex_t = True
-            #mask_kex = ma.masked_values(kex, 0.0)
-            back_calc[:] = r20a
-            return
 
     # The B population.
     pB = 1.0 - pA