Author: bugman Date: Fri Dec 22 04:48:07 2006 New Revision: 2938 URL: http://svn.gna.org/viewcvs/relax?rev=2938&view=rev Log: Ported r2936 from the 1.3 line. The command used was: svn merge -r2935:2936 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 The commit message of the revision was: A small change to clarify the error message produced by bug #8059 (https://gna.org/bugs/?8059). See the post at https://mail.gna.org/public/relax-devel/2006-12/msg00027.html (Message-id: <7f080ed10612210231l17934be5k7b614ab38f1b09d@xxxxxxxxxxxxxx>) for more details. Instead of returning None when no diffusion tensor data is present, a RelaxNoTensorError is raised. Modified: 1.2/specific_fns/model_free.py Modified: 1.2/specific_fns/model_free.py URL: http://svn.gna.org/viewcvs/relax/1.2/specific_fns/model_free.py?rev=2938&r1=2937&r2=2938&view=diff ============================================================================== --- 1.2/specific_fns/model_free.py (original) +++ 1.2/specific_fns/model_free.py Fri Dec 22 04:48:07 2006 @@ -1056,7 +1056,7 @@ # Test if the diffusion tensor data is loaded. if not self.relax.data.diff.has_key(self.run): - return None + raise RelaxNoTensorError, self.run # 'diff' parameter set. if mf_all_fixed: