Author: bugman Date: Tue Apr 2 12:59:57 2013 New Revision: 19306 URL: http://svn.gna.org/viewcvs/relax?rev=19306&view=rev Log: Import rearrangements. Modified: trunk/specific_analyses/consistency_tests.py trunk/specific_analyses/jw_mapping.py Modified: trunk/specific_analyses/consistency_tests.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/consistency_tests.py?rev=19306&r1=19305&r2=19306&view=diff ============================================================================== --- trunk/specific_analyses/consistency_tests.py (original) +++ trunk/specific_analyses/consistency_tests.py Tue Apr 2 12:59:57 2013 @@ -28,16 +28,16 @@ from warnings import warn # relax module imports. +from lib.errors import RelaxError, RelaxFuncSetupError, RelaxNoSequenceError, RelaxNoValueError, RelaxSpinTypeError +from lib.physical_constants import N15_CSA, NH_BOND_LENGTH, h_bar, mu0, return_gyromagnetic_ratio +from lib.warnings import RelaxDeselectWarning +import specific_analyses from pipe_control.interatomic import return_interatom_list from pipe_control.mol_res_spin import exists_mol_res_spin_data, return_spin, spin_loop from pipe_control import pipes -from target_functions.consistency_tests import Consistency -from lib.physical_constants import N15_CSA, NH_BOND_LENGTH, h_bar, mu0, return_gyromagnetic_ratio -from lib.errors import RelaxError, RelaxFuncSetupError, RelaxNoSequenceError, RelaxNoValueError, RelaxSpinTypeError -from lib.warnings import RelaxDeselectWarning -import specific_analyses from specific_analyses.api_base import API_base from specific_analyses.api_common import API_common +from target_functions.consistency_tests import Consistency from user_functions.data import Uf_tables; uf_tables = Uf_tables() from user_functions.objects import Desc_container Modified: trunk/specific_analyses/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/jw_mapping.py?rev=19306&r1=19305&r2=19306&view=diff ============================================================================== --- trunk/specific_analyses/jw_mapping.py (original) +++ trunk/specific_analyses/jw_mapping.py Tue Apr 2 12:59:57 2013 @@ -27,16 +27,16 @@ from warnings import warn # relax module imports. +from lib.errors import RelaxError, RelaxFuncSetupError, RelaxNoSequenceError, RelaxNoValueError, RelaxSpinTypeError +from lib.physical_constants import N15_CSA, NH_BOND_LENGTH, h_bar, mu0, return_gyromagnetic_ratio +from lib.warnings import RelaxDeselectWarning +import specific_analyses +from specific_analyses.api_base import API_base +from specific_analyses.api_common import API_common from pipe_control.interatomic import return_interatom_list from pipe_control.mol_res_spin import exists_mol_res_spin_data, return_spin, spin_loop from pipe_control import pipes from target_functions.jw_mapping import Mapping -from lib.physical_constants import N15_CSA, NH_BOND_LENGTH, h_bar, mu0, return_gyromagnetic_ratio -from lib.errors import RelaxError, RelaxFuncSetupError, RelaxNoSequenceError, RelaxNoValueError, RelaxSpinTypeError -from lib.warnings import RelaxDeselectWarning -import specific_analyses -from specific_analyses.api_base import API_base -from specific_analyses.api_common import API_common from user_functions.data import Uf_tables; uf_tables = Uf_tables() from user_functions.objects import Desc_container