Author: bugman
Date: Mon Oct 5 12:31:33 2015
New Revision: 27985
URL: http://svn.gna.org/viewcvs/relax?rev=27985&view=rev
Log:
Unused import cleanup of all scripts in the
test_suite/shared_data/dispersion/ directories.
This both removes unused imports, or uncomments but deactivates temporarily
unused code.
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_k_AB_FT128.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_r2a_FT128.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_k_AB_FT128.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_r2a_FT128.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/3_simulate_graphs_S65_dw_r2a_FT128.py
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/4_dx_map_S65_FT128.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix2.py
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/monte_carlo.py
trunk/test_suite/shared_data/dispersion/bug_Atul_Srivastava/1atul_R1rho_analysis.py
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_k_AB_FT128.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_k_AB_FT128.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_k_AB_FT128.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_k_AB_FT128.py
Mon Oct 5 12:31:33 2015
@@ -4,7 +4,7 @@
# relax module imports.
from lib.io import open_write_file, write_data
-from pipe_control.mol_res_spin import display_spin, generate_spin_string,
return_spin
+from pipe_control.mol_res_spin import return_spin
from pipe_control import value
from specific_analyses.api import return_api
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_r2a_FT128.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_r2a_FT128.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_r2a_FT128.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/1_create_surface_data_S65_dw_r2a_FT128.py
Mon Oct 5 12:31:33 2015
@@ -4,7 +4,7 @@
# relax module imports.
from lib.io import open_write_file, write_data
-from pipe_control.mol_res_spin import display_spin, generate_spin_string,
return_spin
+from pipe_control.mol_res_spin import return_spin
from pipe_control import value
from specific_analyses.api import return_api
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_k_AB_FT128.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_k_AB_FT128.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_k_AB_FT128.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_k_AB_FT128.py
Mon Oct 5 12:31:33 2015
@@ -2,7 +2,6 @@
import scipy.interpolate
from numpy.ma import masked_where
-from mpl_toolkits.mplot3d import axes3d
import matplotlib.pyplot as plt
from matplotlib import cm
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_r2a_FT128.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_r2a_FT128.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_r2a_FT128.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/2_make_surface_plot_S65_dw_r2a_FT128.py
Mon Oct 5 12:31:33 2015
@@ -2,7 +2,6 @@
import scipy.interpolate
from numpy.ma import masked_where
-from mpl_toolkits.mplot3d import axes3d
import matplotlib.pyplot as plt
from matplotlib import cm
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/3_simulate_graphs_S65_dw_r2a_FT128.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/3_simulate_graphs_S65_dw_r2a_FT128.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/3_simulate_graphs_S65_dw_r2a_FT128.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/3_simulate_graphs_S65_dw_r2a_FT128.py
Mon Oct 5 12:31:33 2015
@@ -4,7 +4,7 @@
# relax module imports.
from lib.io import open_write_file, write_data
-from pipe_control.mol_res_spin import display_spin, generate_spin_string,
return_spin
+from pipe_control.mol_res_spin import display_spin, return_spin
from pipe_control import value
from specific_analyses.api import return_api
Modified:
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/4_dx_map_S65_FT128.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/4_dx_map_S65_FT128.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/4_dx_map_S65_FT128.py
(original)
+++
trunk/test_suite/shared_data/dispersion/KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/4_dx_map_S65_FT128.py
Mon Oct 5 12:31:33 2015
@@ -1,10 +1,8 @@
# Python imports
from os import getcwd, sep
-from numpy import array, float64, zeros
# relax module imports.
-from lib.io import open_write_file
-from pipe_control.mol_res_spin import display_spin, generate_spin_string,
return_spin
+from pipe_control.mol_res_spin import return_spin
# Variables
prev_data_path = getcwd()
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/1_setup_r1rho_GUI.py
Mon Oct 5 12:31:33 2015
@@ -20,12 +20,11 @@
###############################################################################
# Python module imports.
-from os import getcwd, sep
+from os import sep
# relax module imports.
from status import Status; status = Status()
-#data_path = getcwd()
data_path = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'Kjaergaard_et_al_2013'
# Read the spins.
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/3_analyse_models.py
Mon Oct 5 12:31:33 2015
@@ -21,12 +21,11 @@
# Python module imports.
from os import getcwd, sep
-import re
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
from data_store import Relax_data_store; ds = Relax_data_store()
-from lib.dispersion.variables import MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1,
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1
+from lib.dispersion.variables import MODEL_NOREX_R1RHO_FIT_R1,
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1
#########################################
#### Setup
@@ -43,8 +42,10 @@
# The models to analyse.
if not hasattr(ds, 'models'):
- #ds.models = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1,
MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1]
- ds.models = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1]
+ if 0:
+ ds.models = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1,
MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1]
+ else:
+ ds.models = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1]
# The number of increments per parameter, to split up the search interval in
grid search.
if not hasattr(ds, 'grid_inc'):
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/4_inspect_results.py
Mon Oct 5 12:31:33 2015
@@ -21,11 +21,10 @@
# Python module imports.
from os import getcwd, sep
-import re
# relax module imports.
from lib.dispersion.variables import MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1,
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1
-from pipe_control.mol_res_spin import generate_spin_string, return_spin,
spin_loop
+from pipe_control.mol_res_spin import generate_spin_string, spin_loop
from specific_analyses.relax_disp.data import generate_r20_key, loop_exp_frq
#########################################
@@ -39,8 +38,10 @@
pipe.display()
# Define models which have been analysed.
-#MODELS = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1,
MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1]
-MODELS = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1]
+if 0:
+ MODELS = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1,
MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1]
+else:
+ MODELS = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1]
# Print results for each model.
print("\n################")
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/5_clustered_analyses.py
Mon Oct 5 12:31:33 2015
@@ -21,12 +21,11 @@
# Python module imports.
from os import getcwd, sep
-import re
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
from data_store import Relax_data_store; ds = Relax_data_store()
-from lib.dispersion.variables import MODEL_R2EFF, MODEL_NOREX_R1RHO_FIT_R1,
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1
+from lib.dispersion.variables import MODEL_NOREX_R1RHO_FIT_R1,
MODEL_DPL94_FIT_R1, MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1
from pipe_control.mol_res_spin import spin_loop
#########################################
@@ -45,8 +44,10 @@
# The models to analyse.
if not hasattr(ds, 'models'):
- #ds.models = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1,
MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1]
- ds.models = [MODEL_DPL94_FIT_R1]
+ if 0:
+ ds.models = [MODEL_NOREX_R1RHO_FIT_R1, MODEL_DPL94_FIT_R1,
MODEL_TP02_FIT_R1, MODEL_TAP03_FIT_R1, MODEL_MP05_FIT_R1]
+ else:
+ ds.models = [MODEL_DPL94_FIT_R1]
# The number of increments per parameter, to split up the search interval in
grid search.
# This is not used, when pointing to a previous result directory.
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix.py
Mon Oct 5 12:31:33 2015
@@ -1,7 +1,7 @@
# Check the R2eff and I0 errors using the covariance technique.
# Python module imports.
-from os import chdir, getcwd, pardir, sep
+from os import chdir, getcwd, pardir
# Setup.
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix2.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix2.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/covariance_matrix2.py
Mon Oct 5 12:31:33 2015
@@ -1,7 +1,7 @@
# Check the R2eff and I0 errors using the covariance technique.
# Python module imports.
-from os import chdir, getcwd, pardir, sep
+from os import chdir, getcwd, pardir
# Setup.
Modified:
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/monte_carlo.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/monte_carlo.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/monte_carlo.py
(original)
+++
trunk/test_suite/shared_data/dispersion/Kjaergaard_et_al_2013/exp_error_analysis/monte_carlo.py
Mon Oct 5 12:31:33 2015
@@ -1,7 +1,7 @@
# Check the R2eff and I0 errors from a large number of Monte Carlo
simulations.
# Python module imports.
-from os import chdir, getcwd, pardir, sep
+from os import chdir, getcwd, pardir
# Setup.
Modified:
trunk/test_suite/shared_data/dispersion/bug_Atul_Srivastava/1atul_R1rho_analysis.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/bug_Atul_Srivastava/1atul_R1rho_analysis.py?rev=27985&r1=27984&r2=27985&view=diff
==============================================================================
---
trunk/test_suite/shared_data/dispersion/bug_Atul_Srivastava/1atul_R1rho_analysis.py
(original)
+++
trunk/test_suite/shared_data/dispersion/bug_Atul_Srivastava/1atul_R1rho_analysis.py
Mon Oct 5 12:31:33 2015
@@ -1,6 +1,6 @@
###############################################################################
#
#
-# Copyright (C) 2013-2014 Edward d'Auvergne
#
+# Copyright (C) 2013-2015 Edward d'Auvergne
#
# Copyright (C) 2014 Troels E. Linnet
#
#
#
# This file is part of the program relax (http://www.nmr-relax.com).
#
@@ -22,9 +22,6 @@
"""Script for performing a full relaxation dispersion analysis using
off-resonance R1rho-type data."""
-
-# Python module imports.
-from os import sep
# relax module imports.
from auto_analyses.relax_disp import Relax_disp
r27985 - in /trunk/test_suite/shared_data/dispersion: KTeilum_FMPoulsen_MAkke_2006/surface_chi2_clustered_fitting/ Kjaergaar...