Author: bugman
Date: Mon Mar 4 17:21:10 2013
New Revision: 18621
URL: http://svn.gna.org/viewcvs/relax?rev=18621&view=rev
Log:
Import fixes and clean ups for many of the frame order auxiliary functions.
Modified:
branches/frame_order_testing/maths_fns/frame_order/free_rotor.py
branches/frame_order_testing/maths_fns/frame_order/iso_cone.py
branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py
branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py
branches/frame_order_testing/maths_fns/frame_order/rotor.py
Modified: branches/frame_order_testing/maths_fns/frame_order/free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/free_rotor.py?rev=18621&r1=18620&r2=18621&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/free_rotor.py
(original)
+++ branches/frame_order_testing/maths_fns/frame_order/free_rotor.py Mon Mar
4 17:21:10 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2012 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -24,7 +24,6 @@
# relax module imports.
from maths_fns.frame_order.matrix_ops import rotate_daeg
-from multi import Memo, Result_command, Slave_command
def compile_2nd_matrix_free_rotor(matrix, Rx2_eigen):
Modified: branches/frame_order_testing/maths_fns/frame_order/iso_cone.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/iso_cone.py?rev=18621&r1=18620&r2=18621&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/iso_cone.py (original)
+++ branches/frame_order_testing/maths_fns/frame_order/iso_cone.py Mon Mar 4
17:21:10 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2012 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -33,7 +33,6 @@
# relax module imports.
from maths_fns.frame_order.matrix_ops import pcs_pivot_motion_full,
pcs_pivot_motion_full_qrint, rotate_daeg
-from multi import Memo, Result_command, Slave_command
def compile_2nd_matrix_iso_cone(matrix, Rx2_eigen, cone_theta, sigma_max):
Modified:
branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py?rev=18621&r1=18620&r2=18621&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py
(original)
+++ branches/frame_order_testing/maths_fns/frame_order/iso_cone_free_rotor.py
Mon Mar 4 17:21:10 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2012 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -28,7 +28,6 @@
# relax module imports.
from maths_fns.frame_order.matrix_ops import rotate_daeg
from maths_fns import order_parameters
-from multi import Memo, Result_command, Slave_command
def compile_2nd_matrix_iso_cone_free_rotor(matrix, Rx2_eigen, s1):
Modified:
branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py?rev=18621&r1=18620&r2=18621&view=diff
==============================================================================
---
branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py
(original)
+++
branches/frame_order_testing/maths_fns/frame_order/iso_cone_torsionless.py
Mon Mar 4 17:21:10 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2012 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -32,7 +32,6 @@
# relax module imports.
from maths_fns.frame_order.matrix_ops import pcs_pivot_motion_torsionless,
pcs_pivot_motion_torsionless_qrint, rotate_daeg
-from multi import Memo, Result_command, Slave_command
def compile_2nd_matrix_iso_cone_torsionless(matrix, Rx2_eigen, cone_theta):
Modified:
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py?rev=18621&r1=18620&r2=18621&view=diff
==============================================================================
---
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py
(original)
+++
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_free_rotor.py
Mon Mar 4 17:21:10 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2012 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -34,7 +34,6 @@
from maths_fns.frame_order.matrix_ops import rotate_daeg
from maths_fns.frame_order.pec import pec
from maths_fns.frame_order.pseudo_ellipse import tmax_pseudo_ellipse
-from multi import Memo, Result_command, Slave_command
def compile_2nd_matrix_pseudo_ellipse_free_rotor(matrix, Rx2_eigen, theta_x,
theta_y):
Modified:
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py?rev=18621&r1=18620&r2=18621&view=diff
==============================================================================
---
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py
(original)
+++
branches/frame_order_testing/maths_fns/frame_order/pseudo_ellipse_torsionless.py
Mon Mar 4 17:21:10 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2012 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -34,7 +34,6 @@
from maths_fns.frame_order.matrix_ops import pcs_pivot_motion_torsionless,
pcs_pivot_motion_torsionless_qrint, rotate_daeg
from maths_fns.frame_order.pec import pec
from maths_fns.frame_order.pseudo_ellipse import tmax_pseudo_ellipse
-from multi import Memo, Result_command, Slave_command
def compile_2nd_matrix_pseudo_ellipse_torsionless(matrix, Rx2_eigen,
theta_x, theta_y):
Modified: branches/frame_order_testing/maths_fns/frame_order/rotor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order/rotor.py?rev=18621&r1=18620&r2=18621&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order/rotor.py (original)
+++ branches/frame_order_testing/maths_fns/frame_order/rotor.py Mon Mar 4
17:21:10 2013
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2009-2012 Edward d'Auvergne
#
+# Copyright (C) 2009-2013 Edward d'Auvergne
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
#
#
@@ -28,12 +28,12 @@
# Python module imports.
from math import cos, pi, sin, sqrt
from numpy import dot, inner, sinc, transpose
+from numpy.linalg import norm
if dep_check.scipy_module:
from scipy.integrate import quad
# relax module imports.
from maths_fns.frame_order.matrix_ops import rotate_daeg
-from multi import Memo, Result_command, Slave_command
def compile_2nd_matrix_rotor(matrix, Rx2_eigen, smax):
r18621 - /branches/frame_order_testing/maths_fns/frame_order/