Author: bugman
Date: Fri Jul 22 16:57:38 2011
New Revision: 13837
URL: http://svn.gna.org/viewcvs/relax?rev=13837&view=rev
Log:
Merged revisions 13835-13836 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r13835 | bugman | 2011-07-22 16:30:29 +0200 (Fri, 22 Jul 2011) | 6 lines
Fix for the model-free _determine_model_type() method when the spin
container has no 'local_tm'.
This code was failing in certain rare circumstances (when the setting up of
the diffusion tensor was
forgotten).
........
r13836 | bugman | 2011-07-22 16:57:05 +0200 (Fri, 22 Jul 2011) | 3 lines
Created a script for byte compiling the Python source files.
........
Added:
branches/gui_testing/scripts/byte_compile
- copied unchanged from r13836, 1.3/scripts/byte_compile
Modified:
branches/gui_testing/ (props changed)
branches/gui_testing/specific_fns/model_free/main.py
Propchange: branches/gui_testing/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 22 16:57:38 2011
@@ -1,1 +1,1 @@
-/1.3:1-13781
+/1.3:1-13836
Modified: branches/gui_testing/specific_fns/model_free/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/gui_testing/specific_fns/model_free/main.py?rev=13837&r1=13836&r2=13837&view=diff
==============================================================================
--- branches/gui_testing/specific_fns/model_free/main.py (original)
+++ branches/gui_testing/specific_fns/model_free/main.py Fri Jul 22 16:57:38
2011
@@ -738,7 +738,7 @@
if not diffusion_tensor.diff_data_exists():
# Catch when the local tm value is set but not in the parameter
list.
for spin in spin_loop():
- if spin.local_tm != None and not 'local_tm' in spin.params:
+ if hasattr(spin, 'local_tm') and spin.local_tm != None and
not 'local_tm' in spin.params:
raise RelaxError("The local tm value is set but not
located in the model parameter list.")
# Normal error.
r13837 - in /branches/gui_testing: ./ scripts/byte_compile specific_fns/model_free/main.py