r20839 - in /branches/relax_disp/specific_analyses/relax_disp: api.py disp_data.py -- September 05, 2013 - 13:59

Author: bugman
Date: Thu Sep  5 13:59:42 2013
New Revision: 20839

URL: http://svn.gna.org/viewcvs/relax?rev=20839&view=rev
Log:
A few fixes for the relax_disp.exp_type user function changes.

This follows from http://thread.gmane.org/gmane.science.nmr.relax.devel/4530, 
the thread about
supporting multiple data types such as SQ+MQ data simultaneously.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/api.py
    branches/relax_disp/specific_analyses/relax_disp/disp_data.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=20839&r1=20838&r2=20839&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/api.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/api.py Thu Sep  5 
13:59:42 2013
@@ -47,7 +47,7 @@
 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.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_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_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, 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_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 EXP_TYPE_LIST_FIXED_TIME, 
EXP_TYPE_LIST_VAR_TIME, 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

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=20839&r1=20838&r2=20839&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  5 
13:59:42 2013
@@ -557,7 +557,9 @@
     """
 
     # CPMG type data.
-    if exp_type in EXP_TYPE_LIST_CPMG:
+    if exp_type == None:
+        raise RelaxError("The experiment type must be supplied.")
+    elif exp_type in EXP_TYPE_LIST_CPMG:
         fields = cdp.cpmg_frqs_list
     elif exp_type in EXP_TYPE_LIST_R1RHO:
         fields = cdp.spin_lock_nu1_list
@@ -655,7 +657,7 @@
                     data[-1][-1].append(spin.r2eff_err[key])
 
         # Add the back-calculated data.
-        for exp_type, frq in loop_exp_frq(exp_type):
+        for exp_type, frq in loop_exp_frq():
             # Add a new set for the data at each frequency.
             data.append([])
 
@@ -1271,7 +1273,7 @@
             raise RelaxSpinTypeError(spin_id=spin_ids[spin_index])
 
         # Loop over the R2eff data.
-        for frq, point in loop_frq_point():
+        for exp_type, frq, point in loop_exp_frq_point():
             # The indices.
             disp_pt_index = return_index_from_disp_point(point)
             frq_index = return_index_from_frq(frq)