Author: bugman Date: Mon Jul 15 11:36:28 2013 New Revision: 20296 URL: http://svn.gna.org/viewcvs/relax?rev=20296&view=rev Log: Fixes for the construction of the complex conjugate matrix in lib.dispersion.ns_2site_star. Modified: branches/relax_disp/lib/dispersion/ns_2site_star.py Modified: branches/relax_disp/lib/dispersion/ns_2site_star.py URL: http://svn.gna.org/viewcvs/relax/branches/relax_disp/lib/dispersion/ns_2site_star.py?rev=20296&r1=20295&r2=20296&view=diff ============================================================================== --- branches/relax_disp/lib/dispersion/ns_2site_star.py (original) +++ branches/relax_disp/lib/dispersion/ns_2site_star.py Mon Jul 15 11:36:28 2013 @@ -33,7 +33,7 @@ # Python module imports. from math import log -from numpy import conj, dot, matrix +from numpy import complex, conj, dot, matrix if dep_check.scipy_module: from scipy.linalg import expm @@ -80,7 +80,7 @@ Rex = -1.0 * matrix([[k_AB, -k_BA], [-k_AB, k_BA]]) # The matrix that contains the chemical shift evolution. It works here only with X magnetization, and the complex notation allows to evolve in the transverse plane (x, y). - RCS = complex(0.0, -1.0) * matrix([[0.0, 0.0], [0.0, fA]]) + RCS = matrix([[0.0, 0.0], [0.0, complex(0.0, -fA)]], dtype=complex) # The matrix that contains all the contributions to the evolution, i.e. relaxation, exchange and chemical shift evolution. R = Rr + Rex + RCS