Author: bugman
Date: Sun Jun 16 14:35:38 2013
New Revision: 20147
URL: http://svn.gna.org/viewcvs/relax?rev=20147&view=rev
Log:
More cleanups of unused imports throughout relax.
Modified:
trunk/gui/spin_viewer/containers.py
trunk/gui/wizards/peak_intensity.py
trunk/info.py
trunk/setup.py
trunk/target_functions/mf.py
trunk/target_functions/n_state_model.py
Modified: trunk/gui/spin_viewer/containers.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/spin_viewer/containers.py?rev=20147&r1=20146&r2=20147&view=diff
==============================================================================
--- trunk/gui/spin_viewer/containers.py (original)
+++ trunk/gui/spin_viewer/containers.py Sun Jun 16 14:35:38 2013
@@ -32,7 +32,6 @@
from pipe_control.mol_res_spin import return_spin
# GUI module imports.
-from gui import paths
from gui.misc import bitmap_setup
from gui.string_conv import str_to_gui
Modified: trunk/gui/wizards/peak_intensity.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/gui/wizards/peak_intensity.py?rev=20147&r1=20146&r2=20147&view=diff
==============================================================================
--- trunk/gui/wizards/peak_intensity.py (original)
+++ trunk/gui/wizards/peak_intensity.py Sun Jun 16 14:35:38 2013
@@ -37,7 +37,6 @@
from gui.fonts import font
from gui.message import Question
from gui.misc import format_table
-from gui import paths
from gui.string_conv import gui_to_str
from gui.uf_objects import Uf_storage; uf_store = Uf_storage()
from gui.wizards.wiz_objects import Wiz_page, Wiz_window
Modified: trunk/info.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/info.py?rev=20147&r1=20146&r2=20147&view=diff
==============================================================================
--- trunk/info.py (original)
+++ trunk/info.py Sun Jun 16 14:35:38 2013
@@ -36,7 +36,6 @@
from ctypes import Structure
else:
Structure = object
-import numpy
from os import environ, waitpid
import platform
PIPE, Popen = None, None
Modified: trunk/setup.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/setup.py?rev=20147&r1=20146&r2=20147&view=diff
==============================================================================
--- trunk/setup.py (original)
+++ trunk/setup.py Sun Jun 16 14:35:38 2013
@@ -35,7 +35,7 @@
"""
# Python module import.
-from os import getcwd, listdir, sep, walk
+from os import getcwd, sep, walk
from os.path import relpath, sep
from re import search
try:
Modified: trunk/target_functions/mf.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/mf.py?rev=20147&r1=20146&r2=20147&view=diff
==============================================================================
--- trunk/target_functions/mf.py (original)
+++ trunk/target_functions/mf.py Sun Jun 16 14:35:38 2013
@@ -34,8 +34,7 @@
from lib.diffusion.weights import calc_sphere_ci, calc_spheroid_ci,
calc_spheroid_dci, calc_spheroid_d2ci, calc_ellipsoid_ci, calc_ellipsoid_dci,
calc_ellipsoid_d2ci
from lib.spectral_densities.model_free import calc_jw, calc_S2_jw,
calc_S2_te_jw, calc_S2f_S2_ts_jw, calc_S2f_tf_S2_ts_jw, calc_S2f_S2s_ts_jw,
calc_S2f_tf_S2s_ts_jw, calc_diff_djw_dGj, calc_ellipsoid_djw_dGj,
calc_diff_S2_djw_dGj, calc_ellipsoid_S2_djw_dGj, calc_diff_S2_te_djw_dGj,
calc_ellipsoid_S2_te_djw_dGj, calc_diff_djw_dOj, calc_diff_S2_djw_dOj,
calc_diff_S2_te_djw_dOj, calc_S2_djw_dS2, calc_S2_te_djw_dS2,
calc_S2_te_djw_dte, calc_diff_S2f_S2_ts_djw_dGj,
calc_ellipsoid_S2f_S2_ts_djw_dGj, calc_diff_S2f_tf_S2_ts_djw_dGj,
calc_ellipsoid_S2f_tf_S2_ts_djw_dGj, calc_diff_S2f_S2_ts_djw_dOj,
calc_diff_S2f_tf_S2_ts_djw_dOj, calc_S2f_S2_ts_djw_dS2,
calc_S2f_S2_ts_djw_dS2f, calc_S2f_tf_S2_ts_djw_dS2f,
calc_S2f_tf_S2_ts_djw_dtf, calc_S2f_S2_ts_djw_dts,
calc_diff_S2f_S2s_ts_djw_dGj, calc_ellipsoid_S2f_S2s_ts_djw_dGj,
calc_diff_S2f_tf_S2s_ts_djw_dGj, calc_ellipsoid_S2f_tf_S2s_ts_djw_dGj,
calc_diff_S2f_S2s_ts_djw_dOj, calc_diff_S2f_tf_S2s_ts_djw_dOj,
calc_S2f_S2s_ts_djw_dS2f, calc_S2f_tf_S2s_ts_djw_dS2f,
calc_S2f_tf_S2s_ts_djw_dS2s, calc_S2f_tf_S2s_ts_djw_dtf,
calc_S2f_S2s_ts_djw_dts, calc_diff_d2jw_dGjdGk, calc_ellipsoid_d2jw_dGjdGk,
calc_diff_S2_d2jw_dGjdGk, calc_ellipsoid_S2_d2jw_dGjdGk,
calc_diff_S2_te_d2jw_dGjdGk, calc_ellipsoid_S2_te_d2jw_dGjdGk,
calc_diff_d2jw_dGjdOj, calc_ellipsoid_d2jw_dGjdOj, calc_diff_S2_d2jw_dGjdOj,
calc_ellipsoid_S2_d2jw_dGjdOj, calc_diff_S2_te_d2jw_dGjdOj,
calc_ellipsoid_S2_te_d2jw_dGjdOj, calc_diff_S2_d2jw_dGjdS2,
calc_ellipsoid_S2_d2jw_dGjdS2, calc_diff_S2_te_d2jw_dGjdS2,
calc_ellipsoid_S2_te_d2jw_dGjdS2, calc_diff_S2_te_d2jw_dGjdte,
calc_ellipsoid_S2_te_d2jw_dGjdte, calc_diff_d2jw_dOjdOk,
calc_diff_S2_d2jw_dOjdOk, calc_diff_S2_te_d2jw_dOjdOk,
calc_diff_S2_d2jw_dOjdS2, calc_diff_S2_te_d2jw_dOjdS2,
calc_diff_S2_te_d2jw_dOjdte, calc_S2_te_d2jw_dS2dte, calc_S2_te_d2jw_dte2,
calc_diff_S2f_S2_ts_d2jw_dGjdGk, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdGk,
calc_diff_S2f_tf_S2_ts_d2jw_dGjdGk, calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdGk,
calc_diff_S2f_S2_ts_d2jw_dGjdOj, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdOj,
calc_diff_S2f_tf_S2_ts_d2jw_dGjdOj, calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdOj,
calc_diff_S2f_S2_ts_d2jw_dGjdS2, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdS2,
calc_diff_S2f_S2_ts_d2jw_dGjdS2f, calc_ellipsoid_S2f_S2_ts_d2jw_dGjdS2f,
calc_diff_S2f_tf_S2_ts_d2jw_dGjdS2f,
calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdS2f, calc_diff_S2f_tf_S2_ts_d2jw_dGjdtf,
calc_ellipsoid_S2f_tf_S2_ts_d2jw_dGjdtf, calc_diff_S2f_S2_ts_d2jw_dGjdts,
calc_ellipsoid_S2f_S2_ts_d2jw_dGjdts, calc_diff_S2f_S2_ts_d2jw_dOjdOk,
calc_diff_S2f_tf_S2_ts_d2jw_dOjdOk, calc_diff_S2f_S2_ts_d2jw_dOjdS2,
calc_diff_S2f_S2_ts_d2jw_dOjdS2f, calc_diff_S2f_tf_S2_ts_d2jw_dOjdS2f,
calc_diff_S2f_tf_S2_ts_d2jw_dOjdtf, calc_diff_S2f_S2_ts_d2jw_dOjdts,
calc_S2f_S2_ts_d2jw_dS2dts, calc_S2f_tf_S2_ts_d2jw_dS2fdtf,
calc_S2f_S2_ts_d2jw_dS2fdts, calc_S2f_tf_S2_ts_d2jw_dtf2,
calc_S2f_S2_ts_d2jw_dts2, calc_diff_S2f_S2s_ts_d2jw_dGjdGk,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdGk, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdGk,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdGk, calc_diff_S2f_S2s_ts_d2jw_dGjdOj,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdOj, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdOj,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdOj, calc_diff_S2f_S2s_ts_d2jw_dGjdS2f,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdS2f, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdS2f,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdS2f, calc_diff_S2f_S2s_ts_d2jw_dGjdS2s,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdS2s, calc_diff_S2f_tf_S2s_ts_d2jw_dGjdtf,
calc_ellipsoid_S2f_tf_S2s_ts_d2jw_dGjdtf, calc_diff_S2f_S2s_ts_d2jw_dGjdts,
calc_ellipsoid_S2f_S2s_ts_d2jw_dGjdts, calc_diff_S2f_S2s_ts_d2jw_dOjdOk,
calc_diff_S2f_tf_S2s_ts_d2jw_dOjdOk, calc_diff_S2f_S2s_ts_d2jw_dOjdS2f,
calc_diff_S2f_tf_S2s_ts_d2jw_dOjdS2f, calc_diff_S2f_tf_S2s_ts_d2jw_dOjdtf,
calc_diff_S2f_S2s_ts_d2jw_dOjdts, calc_S2f_S2s_ts_d2jw_dS2fdS2s,
calc_S2f_tf_S2s_ts_d2jw_dS2fdtf, calc_S2f_S2s_ts_d2jw_dS2fdts,
calc_S2f_S2s_ts_d2jw_dS2sdts, calc_S2f_tf_S2s_ts_d2jw_dtf2,
calc_S2f_S2s_ts_d2jw_dts2
from lib.spectral_densities.model_free_components import
calc_S2_te_jw_comps, calc_S2f_S2_ts_jw_comps, calc_S2f_S2s_ts_jw_comps,
calc_S2f_tf_S2_ts_jw_comps, calc_S2f_tf_S2s_ts_jw_comps, calc_diff_djw_comps,
calc_S2_te_djw_comps, calc_diff_S2_te_djw_comps, calc_S2f_S2_ts_djw_comps,
calc_diff_S2f_S2_ts_djw_comps, calc_S2f_tf_S2_ts_djw_comps,
calc_diff_S2f_tf_S2_ts_djw_comps, calc_S2f_S2s_ts_djw_comps,
calc_diff_S2f_S2s_ts_djw_comps, calc_S2f_tf_S2s_ts_djw_comps,
calc_diff_S2f_tf_S2s_ts_djw_comps
-
-from target_functions.chi2 import *
+from target_functions.chi2 import chi2, dchi2_element, d2chi2_element
class Mf:
Modified: trunk/target_functions/n_state_model.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/target_functions/n_state_model.py?rev=20147&r1=20146&r2=20147&view=diff
==============================================================================
--- trunk/target_functions/n_state_model.py (original)
+++ trunk/target_functions/n_state_model.py Sun Jun 16 14:35:38 2013
@@ -29,7 +29,7 @@
from lib.alignment.paramag_centre import vectors_single_centre,
vectors_centre_per_state
from lib.alignment.pcs import ave_pcs_tensor, ave_pcs_tensor_ddeltaij_dAmn,
ave_pcs_tensor_ddeltaij_dc, pcs_constant_grad, pcs_tensor
from lib.alignment.rdc import ave_rdc_tensor, ave_rdc_tensor_dDij_dAmn,
rdc_tensor
-from lib.errors import RelaxError, RelaxImplementError
+from lib.errors import RelaxError
from lib.float import isNaN
from lib.geometry.rotations import euler_to_R_zyz
from lib.physical_constants import pcs_constant
r20147 - in /trunk: ./ gui/spin_viewer/ gui/wizards/ target_functions/