r20901 - /branches/relax_disp/specific_analyses/relax_disp/api.py -- September 06, 2013 - 15:22

Author: bugman
Date: Fri Sep  6 15:22:02 2013
New Revision: 20901

URL: http://svn.gna.org/viewcvs/relax?rev=20901&view=rev
Log:
The checks prior to minimisation of the dispersion models is now more 
comprehensive.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/api.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=20901&r1=20900&r2=20901&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/api.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/api.py Fri Sep  6 
15:22:02 2013
@@ -46,7 +46,7 @@
 from pipe_control.mol_res_spin import check_mol_res_spin_data, return_spin, 
spin_loop
 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
+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.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.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
@@ -1059,9 +1059,8 @@
 
         # Data checks.
         check_mol_res_spin_data()
-        check_exp_type()
+        check_spectra_id_setup()
         check_model_type()
-        check_disp_points()
 
         # Initialise some empty data pipe structures so that the target 
function set up does not fail.
         if not hasattr(cdp, 'cpmg_frqs_list'):