Author: bugman Date: Thu Feb 21 09:23:30 2008 New Revision: 5070 URL: http://svn.gna.org/viewcvs/relax?rev=5070&view=rev Log: Merged revisions 5069 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r5069 | bugman | 2008-02-21 09:23:03 +0100 (Thu, 21 Feb 2008) | 3 lines Ok, now the norm() function was in numpy.linalg, not in numpy! ........ Modified: branches/N_state_model/ (props changed) branches/N_state_model/maths_fns/rotation_matrix.py Propchange: branches/N_state_model/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: branches/N_state_model/maths_fns/rotation_matrix.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/maths_fns/rotation_matrix.py?rev=5070&r1=5069&r2=5070&view=diff ============================================================================== --- branches/N_state_model/maths_fns/rotation_matrix.py (original) +++ branches/N_state_model/maths_fns/rotation_matrix.py Thu Feb 21 09:23:30 2008 @@ -21,7 +21,8 @@ ############################################################################### # Python module imports. -from numpy import cross, dot, norm +from numpy import cross, dot +from numpy.linalg import norm from math import acos, cos, sin