r15154 - /branches/frame_order_testing/maths_fns/frame_order.py -- January 12, 2012 - 10:42

Author: bugman
Date: Thu Jan 12 10:42:27 2012
New Revision: 15154

URL: http://svn.gna.org/viewcvs/relax?rev=15154&view=rev
Log:
Import and function alias fixes for the frame order target fucntions.


Modified:
    branches/frame_order_testing/maths_fns/frame_order.py

Modified: branches/frame_order_testing/maths_fns/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/maths_fns/frame_order.py?rev=15154&r1=15153&r2=15154&view=diff
==============================================================================
--- branches/frame_order_testing/maths_fns/frame_order.py (original)
+++ branches/frame_order_testing/maths_fns/frame_order.py Thu Jan 12 10:42:27 
2012
@@ -35,7 +35,7 @@
 from maths_fns.alignment_tensor import to_5D, to_tensor
 from maths_fns.chi2 import chi2
 from maths_fns.coord_transform import spherical_to_cartesian
-from maths_fns.frame_order_matrix_ops import compile_2nd_matrix_free_rotor, 
compile_2nd_matrix_iso_cone, compile_2nd_matrix_iso_cone_free_rotor, 
compile_2nd_matrix_iso_cone_torsionless, compile_2nd_matrix_pseudo_ellipse, 
compile_2nd_matrix_pseudo_ellipse_free_rotor, 
compile_2nd_matrix_pseudo_ellipse_torsionless, compile_2nd_matrix_rotor, 
reduce_alignment_tensor, pcs_numeric_int_iso_cone, 
pcs_numeric_int_iso_cone_mcint, pcs_numeric_int_pseudo_ellipse, 
pcs_numeric_int_pseudo_ellipse_mcint, 
pcs_numeric_int_pseudo_ellipse_torsionless, 
pcs_numeric_int_pseudo_ellipse_torsionless_mcint, pcs_numeric_int_rotor, 
pcs_numeric_int_rotor_mcint
+from maths_fns.frame_order_matrix_ops import compile_2nd_matrix_free_rotor, 
compile_2nd_matrix_iso_cone, compile_2nd_matrix_iso_cone_free_rotor, 
compile_2nd_matrix_iso_cone_torsionless, compile_2nd_matrix_pseudo_ellipse, 
compile_2nd_matrix_pseudo_ellipse_free_rotor, 
compile_2nd_matrix_pseudo_ellipse_torsionless, compile_2nd_matrix_rotor, 
reduce_alignment_tensor, pcs_numeric_int_iso_cone, 
pcs_numeric_int_iso_cone_mcint, pcs_numeric_int_iso_cone_torsionless, 
pcs_numeric_int_iso_cone_torsionless_mcint, pcs_numeric_int_pseudo_ellipse, 
pcs_numeric_int_pseudo_ellipse_mcint, 
pcs_numeric_int_pseudo_ellipse_torsionless, 
pcs_numeric_int_pseudo_ellipse_torsionless_mcint, pcs_numeric_int_rotor, 
pcs_numeric_int_rotor_mcint
 from maths_fns.kronecker_product import kron_prod
 from maths_fns import order_parameters
 from maths_fns.rotation_matrix import euler_to_R_zyz
@@ -278,7 +278,7 @@
             elif model == 'pseudo-ellipse, free rotor':
                 self.func = self.func_pseudo_ellipse_free_rotor_mcint
             elif model == 'iso cone':
-                self.func = self.func_iso_cone_mcint
+                self.func = self.func_iso_cone_mcint_mcint
             elif model == 'iso cone, torsionless':
                 self.func = self.func_iso_cone_torsionless_mcint
             elif model == 'iso cone, free rotor':