Author: bugman Date: Mon Apr 14 14:43:47 2014 New Revision: 22732 URL: http://svn.gna.org/viewcvs/relax?rev=22732&view=rev Log: Expansion of the dx.map user function documentation. This now includes tables of the N-state model and relaxation dispersion parameters. A new auto-generated model-free parameter table including the diffusion parameters has been created and is now used instead of the separate diffusion tensor and model-free parameter tables. Modified: trunk/specific_analyses/model_free/parameter_object.py trunk/user_functions/dx.py Modified: trunk/specific_analyses/model_free/parameter_object.py URL: http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/model_free/parameter_object.py?rev=22732&r1=22731&r2=22732&view=diff ============================================================================== --- trunk/specific_analyses/model_free/parameter_object.py (original) +++ trunk/specific_analyses/model_free/parameter_object.py Mon Apr 14 14:43:47 2014 @@ -71,4 +71,5 @@ # Set up the user function documentation. self._set_uf_title("Model-free parameters") self._uf_param_table(label="table: model-free parameters", caption="Model-free parameters.") + self._uf_param_table(label="table: all model-free parameters", caption="Model-free parameters.", scope=None) self._uf_param_table(label="table: mf parameter value setting", caption="Model-free parameter value setting.", default=True) Modified: trunk/user_functions/dx.py URL: http://svn.gna.org/viewcvs/relax/trunk/user_functions/dx.py?rev=22732&r1=22731&r2=22732&view=diff ============================================================================== --- trunk/user_functions/dx.py (original) +++ trunk/user_functions/dx.py Mon Apr 14 14:43:47 2014 @@ -36,6 +36,8 @@ from pipe_control.opendx import map from prompt.doc_string import regexp_doc from specific_analyses.model_free.parameter_object import Model_free_params; model_free_params = Model_free_params() +from specific_analyses.n_state_model.parameter_object import N_state_params; n_state_params = N_state_params() +from specific_analyses.relax_disp.parameter_object import Relax_disp_params; relax_disp_params = Relax_disp_params() from user_functions.data import Uf_info; uf_info = Uf_info() from user_functions.data import Uf_tables; uf_tables = Uf_tables() from user_functions.objects import Desc_container @@ -202,8 +204,9 @@ uf.desc[-1].add_table(table.label) # Additional. uf.desc.append(regexp_doc) -uf.desc.append(diffusion_tensor.__return_data_name_doc__) -uf.desc.append(model_free_params.uf_doc(label="table: model-free parameters")) +uf.desc.append(model_free_params.uf_doc(label="table: all model-free parameters")) +uf.desc.append(n_state_params.uf_doc(label="table: N-state parameters")) +uf.desc.append(relax_disp_params.uf_doc(label="table: dispersion parameters")) # Prompt examples. uf.desc.append(Desc_container("Prompt examples")) uf.desc[-1].add_paragraph("The following commands will generate a map of the extended model-free space for model 'm5' consisting of the parameters {S2, S2f, ts}. Files will be output into the directory 'dx' and will be prefixed by 'map'. In this case, the system is a protein and residue number 6 will be mapped.")