r21153 - /branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py -- October 17, 2013 - 09:58

Author: bugman
Date: Thu Oct 17 09:58:54 2013
New Revision: 21153

URL: http://svn.gna.org/viewcvs/relax?rev=21153&view=rev
Log:
Python 3 fix for the lib.dispersion.mq_ns_cpmg_2site module.

The numpy.linalg.matrix_power requires an integer power, but Python 3 was 
creating a floating point
number for the 'fact' variable.


Modified:
    branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py

Modified: branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py?rev=21153&r1=21152&r2=21153&view=diff
==============================================================================
--- branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py (original)
+++ branches/relax_disp/lib/dispersion/mq_ns_cpmg_2site.py Thu Oct 17 
09:58:54 2013
@@ -138,7 +138,7 @@
         # Matrices for even n.
         if power[i] % 2 == 0:
             # The power factor (only calculate once).
-            fact = power[i] / 2
+            fact = int(power[i] / 2)
 
             # (M1.M2.M2.M1)^(n/2)
             A = matrix_power(M1_M2_M2_M1, fact)
@@ -155,7 +155,7 @@
         # Matrices for odd n.
         else:
             # The power factor (only calculate once).
-            fact = (power[i] - 1) / 2
+            fact = int((power[i] - 1) / 2)
 
             # (M1.M2.M2.M1)^((n-1)/2).M1.M2
             A = matrix_power(M1_M2_M2_M1, fact)