r20983 - in /branches/relax_disp/specific_analyses/relax_disp: api.py checks.py disp_data.py parameters.py sherekhan.py -- September 12, 2013 - 09:22

Author: bugman
Date: Thu Sep 12 09:22:06 2013
New Revision: 20983

URL: http://svn.gna.org/viewcvs/relax?rev=20983&view=rev
Log:
Removed a tonne of unused imports from the modules of the 
specific_analyses.relax_disp package.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/api.py
    branches/relax_disp/specific_analyses/relax_disp/checks.py
    branches/relax_disp/specific_analyses/relax_disp/disp_data.py
    branches/relax_disp/specific_analyses/relax_disp/parameters.py
    branches/relax_disp/specific_analyses/relax_disp/sherekhan.py

Modified: branches/relax_disp/specific_analyses/relax_disp/api.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/api.py?rev=20983&r1=20982&r2=20983&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/api.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/api.py Thu Sep 12 
09:22:06 2013
@@ -27,9 +27,8 @@
 from copy import deepcopy
 from minfx.generic import generic_minimise
 from minfx.grid import grid
-from numpy import array, average, dot, float64, identity, log, ones, zeros
+from numpy import dot
 from numpy.linalg import inv
-from random import gauss
 from re import match, search
 import sys
 from types import MethodType
@@ -37,10 +36,7 @@
 # relax module imports.
 from dep_check import C_module_exp_fn
 from lib.dispersion.two_point import calc_two_point_r2eff, 
calc_two_point_r2eff_err
-from lib.errors import RelaxError, RelaxLenError, RelaxNoModelError, 
RelaxNoSpectraError
-from lib.list import count_unique_elements, unique_elements
-from lib.mathematics import round_to_next_order
-from lib.statistics import std
+from lib.errors import RelaxError
 from lib.text.sectioning import subsection
 from multi import Processor_box
 from pipe_control import pipes, sequence
@@ -48,9 +44,9 @@
 from specific_analyses.api_base import API_base
 from specific_analyses.api_common import API_common
 from specific_analyses.relax_disp.checks import check_c_modules, 
check_disp_points, check_exp_type, check_exp_type_fixed_time, 
check_model_type, check_pipe_type, check_spectra_id_setup
-from specific_analyses.relax_disp.disp_data import average_intensity, 
find_intensity_keys, get_curve_type, has_exponential_exp_type, loop_cluster, 
loop_exp_frq, loop_exp_frq_point, loop_exp_frq_point_time, loop_frq, 
loop_frq_point, loop_frq_point_key, loop_frq_point_time, loop_point, 
loop_time, relax_time, return_cpmg_frqs, return_index_from_disp_point, 
return_index_from_exp_type, return_index_from_frq, 
return_key_from_disp_point_index, return_offset_data, 
return_param_key_from_data, return_r1_data, return_r2eff_arrays, 
return_spin_lock_nu1, return_value_from_frq_index, spin_ids_to_containers
+from specific_analyses.relax_disp.disp_data import average_intensity, 
find_intensity_keys, get_curve_type, has_exponential_exp_type, loop_cluster, 
loop_exp_frq_point, loop_exp_frq_point_time, loop_frq, loop_time, 
return_cpmg_frqs, return_index_from_disp_point, return_index_from_exp_type, 
return_index_from_frq, return_offset_data, return_param_key_from_data, 
return_r1_data, return_r2eff_arrays, return_spin_lock_nu1, 
spin_ids_to_containers
 from specific_analyses.relax_disp.optimisation import Disp_memo, 
Disp_minimise_command, grid_search_setup
-from specific_analyses.relax_disp.parameters import assemble_param_vector, 
assemble_scaling_matrix, disassemble_param_vector, linear_constraints, 
loop_parameters, param_conversion, param_index_to_param_info, param_num
+from specific_analyses.relax_disp.parameters import assemble_param_vector, 
assemble_scaling_matrix, disassemble_param_vector, linear_constraints, 
param_index_to_param_info, param_num
 from specific_analyses.relax_disp.variables import MODEL_LIST_FULL, 
MODEL_LM63, MODEL_LM63_3SITE, MODEL_CR72, MODEL_CR72_FULL, MODEL_DPL94, 
MODEL_IT99, MODEL_M61, MODEL_M61B, MODEL_NOREX, MODEL_NS_CPMG_2SITE_3D, 
MODEL_NS_CPMG_2SITE_3D_FULL, MODEL_NS_CPMG_2SITE_EXPANDED, 
MODEL_NS_CPMG_2SITE_STAR, MODEL_NS_CPMG_2SITE_STAR_FULL, 
MODEL_NS_R1RHO_2SITE, MODEL_R2EFF, MODEL_TP02, MODEL_TSMFK01
 from target_functions.relax_disp import Dispersion
 from user_functions.data import Uf_tables; uf_tables = Uf_tables()

Modified: branches/relax_disp/specific_analyses/relax_disp/checks.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/checks.py?rev=20983&r1=20982&r2=20983&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/checks.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/checks.py Thu Sep 12 
09:22:06 2013
@@ -27,7 +27,7 @@
 
 # relax module imports.
 from dep_check import C_module_exp_fn
-from lib.errors import RelaxError, RelaxFuncSetupError, RelaxNoFrqError, 
RelaxNoPeakIntensityError
+from lib.errors import RelaxError, RelaxFuncSetupError, 
RelaxNoPeakIntensityError
 import specific_analyses
 from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG, 
EXP_TYPE_R1RHO
 

Modified: branches/relax_disp/specific_analyses/relax_disp/disp_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/disp_data.py?rev=20983&r1=20982&r2=20983&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/disp_data.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/disp_data.py Thu Sep 12 
09:22:06 2013
@@ -40,7 +40,6 @@
 # relax module imports.
 from lib.errors import RelaxError, RelaxNoSpectraError, RelaxSpinTypeError
 from lib.io import get_file_path, open_write_file
-from lib.list import count_unique_elements, unique_elements
 from lib.physical_constants import g1H, return_gyromagnetic_ratio
 from lib.software.grace import write_xy_data, write_xy_header, 
script_grace2images
 from pipe_control import pipes
@@ -50,7 +49,7 @@
 from specific_analyses.relax_disp.checks import check_exp_type, 
check_mixed_curve_types
 from specific_analyses.relax_disp.variables import EXP_TYPE_CPMG, 
EXP_TYPE_DESC_CPMG, EXP_TYPE_DESC_R1RHO, EXP_TYPE_LIST, EXP_TYPE_R1RHO
 from stat import S_IRWXU, S_IRGRP, S_IROTH
-from os import chmod, path, sep
+from os import chmod, sep
 
 
 

Modified: branches/relax_disp/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/parameters.py?rev=20983&r1=20982&r2=20983&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/parameters.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/parameters.py Thu Sep 12 
09:22:06 2013
@@ -26,17 +26,15 @@
 # Python module imports.
 from copy import deepcopy
 from numpy import array, float64, identity, zeros
-from re import search
 import sys
 
 # relax module imports.
 from lib.errors import RelaxError, RelaxNoSequenceError
-from lib.mathematics import round_to_next_order
 from lib.text.sectioning import subsection
 from pipe_control import pipes
 from pipe_control.mol_res_spin import exists_mol_res_spin_data, return_spin
-from specific_analyses.relax_disp.disp_data import count_frq, 
has_exponential_exp_type, loop_cluster, loop_frq
-from specific_analyses.relax_disp.variables import MODEL_R2EFF, MODEL_M61B
+from specific_analyses.relax_disp.disp_data import has_exponential_exp_type, 
loop_cluster, loop_frq
+from specific_analyses.relax_disp.variables import MODEL_M61B
 
 
 def assemble_param_vector(spins=None, key=None, sim_index=None):

Modified: branches/relax_disp/specific_analyses/relax_disp/sherekhan.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/sherekhan.py?rev=20983&r1=20982&r2=20983&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/sherekhan.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/sherekhan.py Thu Sep 12 
09:22:06 2013
@@ -26,20 +26,16 @@
 import dep_check
 
 # Python module imports.
-from math import pi
-from os import F_OK, access, chmod, sep
 PIPE, Popen = None, None
 if dep_check.subprocess_module:
     from subprocess import PIPE, Popen
-import sys
 
 # relax module imports.
-from lib.errors import RelaxError, RelaxDirError, RelaxFileError, 
RelaxNoSequenceError
-from lib.io import mkdir_nofail, open_write_file
+from lib.errors import RelaxError, RelaxNoSequenceError
+from lib.io import open_write_file
 from lib.physical_constants import g1H, g15N
 from pipe_control import pipes
-from pipe_control.mol_res_spin import exists_mol_res_spin_data, 
return_residue, spin_loop
-from pipe_control.spectrometer import get_frequencies
+from pipe_control.mol_res_spin import exists_mol_res_spin_data, 
return_residue
 from specific_analyses.relax_disp.disp_data import loop_cluster, 
loop_exp_frq, loop_point, return_param_key_from_data, spin_ids_to_containers