Author: tlinnet
Date: Mon Sep 1 13:45:40 2014
New Revision: 25496
URL: http://svn.gna.org/viewcvs/relax?rev=25496&view=rev
Log:
Reverted r25463, related setting fit of R1 in GUI
The command used was:
svn merge -r25463:r25462 .
........
r25463 | tlinnet | 2014-08-30 00:00:45 +0200 (Sat, 30 Aug 2014) | 3 lines
Fix for 'r1' not being added to parameters, when looking up model in
dictionary.
bug #22541(https://gna.org/bugs/?22541): The R1 fit flag does not work in
the GUI.
........
Modified:
trunk/specific_analyses/relax_disp/uf.py
Modified: trunk/specific_analyses/relax_disp/uf.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/specific_analyses/relax_disp/uf.py?rev=25496&r1=25495&r2=25496&view=diff
==============================================================================
--- trunk/specific_analyses/relax_disp/uf.py (original)
+++ trunk/specific_analyses/relax_disp/uf.py Mon Sep 1 13:45:40 2014
@@ -169,19 +169,8 @@
# All other models.
else:
- # Should r1 parameter be added to params?
- add_r1 = False
+ params = MODEL_PARAMS[model]
- # Check if r1_fit is stored in cdp.
- if hasattr(cdp, 'r1_fit'):
- if cdp.r1_fit:
- if 'r1' not in MODEL_PARAMS[model]:
- add_r1 = True
- if add_r1:
- params = ['r1'] + MODEL_PARAMS[model]
- else:
- params = MODEL_PARAMS[model]
-
# Printout.
print(MODEL_DESC[model])
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
[email protected]
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
