Author: bugman
Date: Mon Oct 5 13:47:24 2015
New Revision: 27989
URL: http://svn.gna.org/viewcvs/relax?rev=27989&view=rev
Log:
Clean up of all unused imports in the system test scripts.
Modified:
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py
trunk/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
Modified:
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py?rev=27989&r1=27988&r2=27989&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor.py
Mon Oct 5 13:47:24 2015
@@ -25,7 +25,6 @@
# relax module imports.
from base_script import Base_script
from lib.frame_order.variables import MODEL_ISO_CONE_FREE_ROTOR
-from lib.order.order_parameters import iso_cone_theta_to_S
class Analysis(Base_script):
Modified:
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py?rev=27989&r1=27988&r2=27989&view=diff
==============================================================================
---
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
(original)
+++
trunk/test_suite/system_tests/scripts/frame_order/cam/iso_cone_free_rotor2.py
Mon Oct 5 13:47:24 2015
@@ -25,7 +25,6 @@
# relax module imports.
from base_script import Base_script
from lib.frame_order.variables import MODEL_ISO_CONE_FREE_ROTOR
-from lib.order.order_parameters import iso_cone_theta_to_S
class Analysis(Base_script):
Modified: trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py?rev=27989&r1=27988&r2=27989&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py
(original)
+++ trunk/test_suite/system_tests/scripts/relax_disp/cpmg_synthetic.py Mon
Oct 5 13:47:24 2015
@@ -46,35 +46,47 @@
##################################################################################
# The dispersion model to test.
if not hasattr(ds, 'data'):
- ### Take a numerical model to create the data.
- ## The "NS CPMG 2-site 3D full" is here the best, since you can define
both r2a and r2b.
- #model_create = MODEL_NS_CPMG_2SITE_3D
- #model_create = MODEL_NS_CPMG_2SITE_3D_FULL
- #model_create = MODEL_NS_CPMG_2SITE_STAR
- #model_create = MODEL_NS_CPMG_2SITE_STAR_FULL
- model_create = MODEL_NS_CPMG_2SITE_EXPANDED
- #model_create = MODEL_CR72
- #model_create = MODEL_CR72_FULL
- #model_create = MODEL_B14
- #model_create = MODEL_B14_FULL
-
- ### The select a model to analyse with.
- ## Analytical : r2a = r2b
- model_analyse = MODEL_CR72
- #model_analyse = MODEL_IT99
- #model_analyse = MODEL_TSMFK01
- #model_analyse = MODEL_B14
-
- ## Analytical full : r2a != r2b
- #model_analyse = MODEL_CR72_FULL
- #model_analyse = MODEL_B14_FULL
- ## NS : r2a = r2b
- #model_analyse = MODEL_NS_CPMG_2SITE_3D
- #model_analyse = MODEL_NS_CPMG_2SITE_STAR
- #model_analyse = MODEL_NS_CPMG_2SITE_EXPANDED
- ## NS full : r2a = r2b
- #model_analyse = MODEL_NS_CPMG_2SITE_3D_FULL
- #model_analyse = MODEL_NS_CPMG_2SITE_STAR_FULL
+ ## Take a numerical model to create the data.
+ model_create_list = []
+
+ # The "NS CPMG 2-site 3D full" is here the best, since you can define
both r2a and r2b.
+ model_create_list.append(MODEL_NS_CPMG_2SITE_3D)
+ model_create_list.append(MODEL_NS_CPMG_2SITE_3D_FULL)
+ model_create_list.append(MODEL_NS_CPMG_2SITE_STAR)
+ model_create_list.append(MODEL_NS_CPMG_2SITE_STAR_FULL)
+ model_create_list.append(MODEL_NS_CPMG_2SITE_EXPANDED)
+ model_create_list.append(MODEL_CR72)
+ model_create_list.append(MODEL_CR72_FULL)
+ model_create_list.append(MODEL_B14)
+ model_create_list.append(MODEL_B14_FULL)
+
+ # The model.
+ model_create = model_create_list[4]
+
+ ## The select a model to analyse with.
+ model_analyse_list = []
+
+ # Analytical : r2a = r2b
+ model_analyse_list.append(MODEL_CR72)
+ model_analyse_list.append(MODEL_IT99)
+ model_analyse_list.append(MODEL_TSMFK01)
+ model_analyse_list.append(MODEL_B14)
+
+ # Analytical full : r2a != r2b
+ model_analyse_list.append(MODEL_CR72_FULL)
+ model_analyse_list.append(MODEL_B14_FULL)
+
+ # NS : r2a = r2b
+ model_analyse_list.append(MODEL_NS_CPMG_2SITE_3D)
+ model_analyse_list.append(MODEL_NS_CPMG_2SITE_STAR)
+ model_analyse_list.append(MODEL_NS_CPMG_2SITE_EXPANDED)
+
+ # NS full : r2a = r2b
+ model_analyse_list.append(MODEL_NS_CPMG_2SITE_3D_FULL)
+ model_analyse_list.append(MODEL_NS_CPMG_2SITE_STAR_FULL)
+
+ # The model.
+ model_analyse = model_analyse_list[0]
## Experiments
# Exp 1
Modified:
trunk/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py?rev=27989&r1=27988&r2=27989&view=diff
==============================================================================
--- trunk/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
(original)
+++ trunk/test_suite/system_tests/scripts/relax_fit_exp_3param_inv_neg.py
Mon Oct 5 13:47:24 2015
@@ -2,7 +2,6 @@
# Python module imports.
from os import sep
-import sys
# relax module imports.
from data_store import Relax_data_store; ds = Relax_data_store()
r27989 - in /trunk/test_suite/system_tests/scripts: ./ frame_order/cam/ relax_disp/