r19043 - in /trunk: auto_analyses/ data_store/ generic_fns/ specific_analyses/ target_functions/frame_order/ test_suite/shar... -- March 23, 2013 - 09:30

Author: bugman
Date: Sat Mar 23 09:30:37 2013
New Revision: 19043

URL: http://svn.gna.org/viewcvs/relax?rev=19043&view=rev
Log:
Import fixes for the lib.geometry.coord_transform module.


Modified:
    trunk/auto_analyses/frame_order.py
    trunk/data_store/diff_tensor.py
    trunk/generic_fns/diffusion_tensor.py
    trunk/specific_analyses/frame_order.py
    trunk/target_functions/frame_order/__init__.py
    trunk/test_suite/shared_data/frame_order/cam/generate_base.py
    trunk/test_suite/system_tests/diffusion_tensor.py
    trunk/test_suite/system_tests/frame_order.py
    
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py
    
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
    trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
    
trunk/test_suite/unit_tests/_target_functions/_frame_order/test_matrix_ops.py

Modified: trunk/auto_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/auto_analyses/frame_order.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/auto_analyses/frame_order.py (original)
+++ trunk/auto_analyses/frame_order.py Sat Mar 23 09:30:37 2013
@@ -36,7 +36,7 @@
 from generic_fns.angles import wrap_angles
 from generic_fns.pipes import cdp_name, get_pipe
 from lib.text.sectioning import section, subsection, title
-from target_functions.coord_transform import spherical_to_cartesian
+from lib.geometry.coord_transform import spherical_to_cartesian
 from prompt.interpreter import Interpreter
 from lib.errors import RelaxError
 from lib.io import open_write_file

Modified: trunk/data_store/diff_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/data_store/diff_tensor.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/data_store/diff_tensor.py (original)
+++ trunk/data_store/diff_tensor.py Sat Mar 23 09:30:37 2013
@@ -32,7 +32,7 @@
 # relax module imports.
 from data_store.data_classes import Element
 from data_store.relax_xml import fill_object_contents, xml_to_object
-from target_functions.coord_transform import spherical_to_cartesian
+from lib.geometry.coord_transform import spherical_to_cartesian
 from lib.geometry.rotations import two_vect_to_R
 from lib.errors import RelaxError
 

Modified: trunk/generic_fns/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/generic_fns/diffusion_tensor.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/generic_fns/diffusion_tensor.py (original)
+++ trunk/generic_fns/diffusion_tensor.py Sat Mar 23 09:30:37 2013
@@ -36,7 +36,7 @@
 from generic_fns.angles import fold_spherical_angles, wrap_angles
 from generic_fns.interatomic import return_interatom_list
 from generic_fns.mol_res_spin import get_molecule_names, return_spin, 
spin_loop
-from target_functions.coord_transform import cartesian_to_spherical
+from lib.geometry.coord_transform import cartesian_to_spherical
 from lib.geometry.rotations import R_to_euler_zyz
 from lib.physical_constants import element_from_isotope, number_from_isotope
 from lib.errors import RelaxError, RelaxNoTensorError, RelaxStrError, 
RelaxTensorError, RelaxUnknownParamCombError, RelaxUnknownParamError

Modified: trunk/specific_analyses/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/frame_order.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/specific_analyses/frame_order.py (original)
+++ trunk/specific_analyses/frame_order.py Sat Mar 23 09:30:37 2013
@@ -47,7 +47,7 @@
 from lib.structure.rotor import rotor_pdb
 from lib.text.sectioning import subsection
 from target_functions import frame_order, order_parameters
-from target_functions.coord_transform import spherical_to_cartesian
+from lib.geometry.coord_transform import spherical_to_cartesian
 from lib.geometry.rotations import euler_to_R_zyz, two_vect_to_R
 from lib.physical_constants import dipolar_constant, g1H, 
return_gyromagnetic_ratio
 from lib.errors import RelaxError, RelaxInfError, RelaxNaNError, 
RelaxNoModelError, RelaxNoPCSError, RelaxNoRDCError, RelaxNoValueError, 
RelaxSpinTypeError

Modified: trunk/target_functions/frame_order/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/target_functions/frame_order/__init__.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/target_functions/frame_order/__init__.py (original)
+++ trunk/target_functions/frame_order/__init__.py Sat Mar 23 09:30:37 2013
@@ -34,7 +34,7 @@
 from extern.sobol.sobol_lib import i4_sobol
 from lib.alignment.alignment_tensor import to_5D, to_tensor
 from target_functions.chi2 import chi2
-from target_functions.coord_transform import spherical_to_cartesian
+from lib.geometry.coord_transform import spherical_to_cartesian
 from target_functions.frame_order.matrix_ops import Data, 
reduce_alignment_tensor
 from target_functions.frame_order.rotor import compile_2nd_matrix_rotor, 
pcs_numeric_int_rotor, pcs_numeric_int_rotor_qrint
 from target_functions.frame_order.free_rotor import 
compile_2nd_matrix_free_rotor

Modified: trunk/test_suite/shared_data/frame_order/cam/generate_base.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/frame_order/cam/generate_base.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/test_suite/shared_data/frame_order/cam/generate_base.py (original)
+++ trunk/test_suite/shared_data/frame_order/cam/generate_base.py Sat Mar 23 
09:30:37 2013
@@ -34,7 +34,7 @@
 from generic_fns.frame_order import print_frame_order_2nd_degree
 from generic_fns.mol_res_spin import spin_loop
 from generic_fns.interatomic import interatomic_loop
-from target_functions.coord_transform import cartesian_to_spherical
+from lib.geometry.coord_transform import cartesian_to_spherical
 from target_functions.kronecker_product import kron_prod
 from lib.geometry.rotations import axis_angle_to_R, R_to_euler_zyz
 from prompt.interpreter import Interpreter

Modified: trunk/test_suite/system_tests/diffusion_tensor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/diffusion_tensor.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/test_suite/system_tests/diffusion_tensor.py (original)
+++ trunk/test_suite/system_tests/diffusion_tensor.py Sat Mar 23 09:30:37 2013
@@ -31,7 +31,7 @@
 from generic_fns.mol_res_spin import spin_loop
 from generic_fns.pipes import get_pipe
 from generic_fns.reset import reset
-from target_functions.coord_transform import spherical_to_cartesian
+from lib.geometry.coord_transform import spherical_to_cartesian
 from lib.geometry.rotations import axis_angle_to_R, euler_to_R_zyz, 
two_vect_to_R
 from lib.io import delete
 from status import Status; status = Status()

Modified: trunk/test_suite/system_tests/frame_order.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/frame_order.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/test_suite/system_tests/frame_order.py (original)
+++ trunk/test_suite/system_tests/frame_order.py Sat Mar 23 09:30:37 2013
@@ -32,7 +32,7 @@
 # relax module imports.
 from data_store import Relax_data_store; ds = Relax_data_store()
 import dep_check
-from target_functions.coord_transform import spherical_to_cartesian
+from lib.geometry.coord_transform import spherical_to_cartesian
 from lib.geometry.rotations import euler_to_R_zyz
 from lib.physical_constants import N15_CSA, NH_BOND_LENGTH
 from lib.io import DummyFileObject, open_read_file

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- 
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py 
(original)
+++ 
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/free_rotor.py 
Sat Mar 23 09:30:37 2013
@@ -6,7 +6,7 @@
 
 # relax module imports.
 from data_store import Relax_data_store; ds = Relax_data_store()
-from target_functions.coord_transform import cartesian_to_spherical
+from lib.geometry.coord_transform import cartesian_to_spherical
 from status import Status; status = Status()
 
 

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- 
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
 (original)
+++ 
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/iso_cone_free_rotor.py
 Sat Mar 23 09:30:37 2013
@@ -7,7 +7,7 @@
 
 # relax module imports.
 from data_store import Relax_data_store; ds = Relax_data_store()
-from target_functions.coord_transform import cartesian_to_spherical
+from lib.geometry.coord_transform import cartesian_to_spherical
 from target_functions.order_parameters import iso_cone_theta_to_S
 from status import Status; status = Status()
 

Modified: 
trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py 
(original)
+++ trunk/test_suite/system_tests/scripts/frame_order/model_calcs/rotor.py 
Sat Mar 23 09:30:37 2013
@@ -6,7 +6,7 @@
 
 # relax module imports.
 from data_store import Relax_data_store; ds = Relax_data_store()
-from target_functions.coord_transform import cartesian_to_spherical
+from lib.geometry.coord_transform import cartesian_to_spherical
 from status import Status; status = Status()
 
 

Modified: 
trunk/test_suite/unit_tests/_target_functions/_frame_order/test_matrix_ops.py
URL: 
http://svn.gna.org/viewcvs/relax/trunk/test_suite/unit_tests/_target_functions/_frame_order/test_matrix_ops.py?rev=19043&r1=19042&r2=19043&view=diff
==============================================================================
--- 
trunk/test_suite/unit_tests/_target_functions/_frame_order/test_matrix_ops.py 
(original)
+++ 
trunk/test_suite/unit_tests/_target_functions/_frame_order/test_matrix_ops.py 
Sat Mar 23 09:30:37 2013
@@ -26,7 +26,7 @@
 
 # relax module imports.
 from generic_fns.frame_order import print_frame_order_2nd_degree
-from target_functions.coord_transform import cartesian_to_spherical
+from lib.geometry.coord_transform import cartesian_to_spherical
 from target_functions.frame_order import *
 from target_functions.kronecker_product import transpose_23
 from target_functions.order_parameters import iso_cone_theta_to_S