And the '* 3-site linear' models before the '* 3-site' models, as the
linear model is a simplified version of the non-linear '* 3-site'
models. Then the 3-site linear model parameters can be taken for the
non-linear 3-site models.
Cheers,
Edward
On 19 August 2014 18:00, Edward d'Auvergne <edward@xxxxxxxxxxxxx> wrote:
For the ordering, it would be better to have the faster 'NS CPMG
2-site expanded' model before and of the other 'NS CPMG *' models.
This model is just as accurate as the other NS models, but it much
faster as you have seen and optimised. So using it as the first NS
model will be beneficial for speed.
Cheers,
Edward
On 19 August 2014 17:57, Edward d'Auvergne <edward@xxxxxxxxxxxxx> wrote:
Awesome, this allows us to check the table in the manual for
consistency as new models are added or as the code evolves.
Cheers,
Edward
On 19 August 2014 13:32, <tlinnet@xxxxxxxxxxxxx> wrote:
Author: tlinnet
Date: Tue Aug 19 13:32:02 2014
New Revision: 25073
URL: http://svn.gna.org/viewcvs/relax?rev=25073&view=rev
Log:
Added initial python script, to help print each model and its
corresponding nested models.
It can be executed by:
relax
test_suite/shared_data/dispersion/print_model_info/print_model_info.py
Added:
trunk/test_suite/shared_data/dispersion/print_model_info/
trunk/test_suite/shared_data/dispersion/print_model_info/print_model_info.py
(with props)
Added:
trunk/test_suite/shared_data/dispersion/print_model_info/print_model_info.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/shared_data/dispersion/print_model_info/print_model_info.py?rev=25073&view=auto
==============================================================================
---
trunk/test_suite/shared_data/dispersion/print_model_info/print_model_info.py
(added)
+++
trunk/test_suite/shared_data/dispersion/print_model_info/print_model_info.py
Tue Aug 19 13:32:02 2014
@@ -0,0 +1,42 @@
+###############################################################################
+#
#
+# Copyright (C) 2014 Troels E. Linnet
#
+#
#
+# This file is part of the program relax (http://www.nmr-relax.com).
#
+#
#
+# This program is free software: you can redistribute it and/or modify
#
+# it under the terms of the GNU General Public License as published by
#
+# the Free Software Foundation, either version 3 of the License, or
#
+# (at your option) any later version.
#
+#
#
+# This program is distributed in the hope that it will be useful,
#
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
#
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#
+# GNU General Public License for more details.
#
+#
#
+# You should have received a copy of the GNU General Public License
#
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
#
+#
#
+###############################################################################
+
+# Module docstring.
+"""Short python script, to produce model information. This script file
could be extended to produce up-to-date Latex tables."""
+
+# relax module imports.
+from specific_analyses.relax_disp.variables import MODEL_LIST_FULL
+from specific_analyses.relax_disp.model import models_info
+
+# Get info for all models.
+all_models_info = models_info(models=MODEL_LIST_FULL)
+
+# Print the nested list for each model.
+print("Printing the listed models for each model")
+print("#########################################")
+for model_info in all_models_info:
+ print("%s"%model_info.model),
+ print("<-"),
+ nest_list = model_info.nest_list
+ if nest_list == None:
+ nest_list = ["None"]
+ #print("%s"%model_info.nest_list)
+ print(', '.join(map(str, nest_list)))
Propchange:
trunk/test_suite/shared_data/dispersion/print_model_info/print_model_info.py
------------------------------------------------------------------------------
svn:executable = *
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-devel mailing list
relax-devel@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-devel
Re: r25073 - in /trunk/test_suite/shared_data/dispersion/print_model_info: ./ print_model_info.py