r23200 - /branches/frame_order_cleanup/target_functions/frame_order.py -- May 16, 2014 - 14:14

Author: bugman
Date: Fri May 16 14:14:48 2014
New Revision: 23200

URL: http://svn.gna.org/viewcvs/relax?rev=23200&view=rev
Log:
Import cleanup for the frame order target functions.

The Scipy quadratic integration functions for the PCS have been removed.


Modified:
    branches/frame_order_cleanup/target_functions/frame_order.py

Modified: branches/frame_order_cleanup/target_functions/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/target_functions/frame_order.py?rev=23200&r1=23199&r2=23200&view=diff
==============================================================================
--- branches/frame_order_cleanup/target_functions/frame_order.py        
(original)
+++ branches/frame_order_cleanup/target_functions/frame_order.py        Fri 
May 16 14:14:48 2014
@@ -37,14 +37,14 @@
 from lib.float import isNaN
 from lib.frame_order.double_rotor import compile_2nd_matrix_double_rotor, 
pcs_numeric_int_double_rotor
 from lib.frame_order.free_rotor import compile_2nd_matrix_free_rotor
-from lib.frame_order.iso_cone import compile_2nd_matrix_iso_cone, 
pcs_numeric_int_iso_cone, pcs_numeric_int_iso_cone_qrint
+from lib.frame_order.iso_cone import compile_2nd_matrix_iso_cone, 
pcs_numeric_int_iso_cone_qrint
 from lib.frame_order.iso_cone_free_rotor import 
compile_2nd_matrix_iso_cone_free_rotor
-from lib.frame_order.iso_cone_torsionless import 
compile_2nd_matrix_iso_cone_torsionless, 
pcs_numeric_int_iso_cone_torsionless, 
pcs_numeric_int_iso_cone_torsionless_qrint
+from lib.frame_order.iso_cone_torsionless import 
compile_2nd_matrix_iso_cone_torsionless, 
pcs_numeric_int_iso_cone_torsionless_qrint
 from lib.frame_order.matrix_ops import reduce_alignment_tensor
-from lib.frame_order.pseudo_ellipse import 
compile_2nd_matrix_pseudo_ellipse, pcs_numeric_int_pseudo_ellipse, 
pcs_numeric_int_pseudo_ellipse_qrint
+from lib.frame_order.pseudo_ellipse import 
compile_2nd_matrix_pseudo_ellipse, pcs_numeric_int_pseudo_ellipse_qrint
 from lib.frame_order.pseudo_ellipse_free_rotor import 
compile_2nd_matrix_pseudo_ellipse_free_rotor
-from lib.frame_order.pseudo_ellipse_torsionless import 
compile_2nd_matrix_pseudo_ellipse_torsionless, 
pcs_numeric_int_pseudo_ellipse_torsionless, 
pcs_numeric_int_pseudo_ellipse_torsionless_qrint
-from lib.frame_order.rotor import compile_2nd_matrix_rotor, 
pcs_numeric_int_rotor, pcs_numeric_int_rotor_qrint
+from lib.frame_order.pseudo_ellipse_torsionless import 
compile_2nd_matrix_pseudo_ellipse_torsionless, 
pcs_numeric_int_pseudo_ellipse_torsionless_qrint
+from lib.frame_order.rotor import compile_2nd_matrix_rotor, 
pcs_numeric_int_rotor_qrint
 from lib.frame_order.rotor_axis import create_rotor_axis_alpha
 from lib.geometry.coord_transform import spherical_to_cartesian
 from lib.geometry.rotations import euler_to_R_zyz, two_vect_to_R