r19054 - in /trunk/target_functions/frame_order: __init__.py iso_cone_free_rotor.py -- March 23, 2013 - 10:23

Author: bugman
Date: Sat Mar 23 10:23:13 2013
New Revision: 19054

URL: http://svn.gna.org/viewcvs/relax?rev=19054&view=rev
Log:
Import fixes for the shifted lib.order.order_parameter module.


Modified:
    trunk/target_functions/frame_order/__init__.py
    trunk/target_functions/frame_order/iso_cone_free_rotor.py

Modified: trunk/target_functions/frame_order/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/target_functions/frame_order/__init__.py?rev=19054&r1=19053&r2=19054&view=diff
==============================================================================
--- trunk/target_functions/frame_order/__init__.py (original)
+++ trunk/target_functions/frame_order/__init__.py Sat Mar 23 10:23:13 2013
@@ -45,10 +45,10 @@
 from target_functions.frame_order.pseudo_ellipse_free_rotor import 
compile_2nd_matrix_pseudo_ellipse_free_rotor
 from target_functions.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.algebra.kronecker_product import kron_prod
-from target_functions import order_parameters
 from lib.alignment.pcs import pcs_tensor
 from lib.geometry.rotations import euler_to_R_zyz, two_vect_to_R
 from lib.alignment.rdc import rdc_tensor
+from lib.order import order_parameters
 from lib.physical_constants import pcs_constant
 from lib.errors import RelaxError
 

Modified: trunk/target_functions/frame_order/iso_cone_free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/target_functions/frame_order/iso_cone_free_rotor.py?rev=19054&r1=19053&r2=19054&view=diff
==============================================================================
--- trunk/target_functions/frame_order/iso_cone_free_rotor.py (original)
+++ trunk/target_functions/frame_order/iso_cone_free_rotor.py Sat Mar 23 
10:23:13 2013
@@ -26,8 +26,8 @@
 from math import cos
 
 # relax module imports.
+from lib.order import order_parameters
 from target_functions.frame_order.matrix_ops import rotate_daeg
-from target_functions import order_parameters
 
 
 def compile_2nd_matrix_iso_cone_free_rotor(matrix, Rx2_eigen, s1):