Author: bugman
Date: Sun Jul 22 18:32:38 2007
New Revision: 3348
URL: http://svn.gna.org/viewcvs/relax?rev=3348&view=rev
Log:
Merged revisions 3345 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r3345 | bugman | 2007-07-22 18:19:33 +0200 (Sun, 22 Jul 2007) | 10 lines
Fix for bug #9562 (http://gna.org/bugs/?9562).
This bug was reported and fixed by Sebastien Morin (sebastien dot morin dot
1 at ulaval dot ca) by
the patch 'patch__specific_fns__jw_mapping__l1.3_r3342' attached to the bug
report.
In the 1.3 line, revision 3342, there is a typo in the 'set()' function of
the file
'specific_fns/jw_mapping.py'. The string 'csa' is used twice on line 398.
The string 'csa' should
be used first and, then, the string 'r'.
........
Modified:
1.2/ (props changed)
1.2/specific_fns/jw_mapping.py
Propchange: 1.2/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Jul 22 18:32:38 2007
@@ -1,1 +1,1 @@
-/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318
+/1.3:1-2505,2941,2947,2950,2974,2976,2979,2984,2988,3076,3083-3084,3087,3117,3299,3309,3312,3314,3318,3345
Modified: 1.2/specific_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/1.2/specific_fns/jw_mapping.py?rev=3348&r1=3347&r2=3348&view=diff
==============================================================================
--- 1.2/specific_fns/jw_mapping.py (original)
+++ 1.2/specific_fns/jw_mapping.py Sun Jul 22 18:32:38 2007
@@ -388,7 +388,7 @@
value.append(self.default_value('r'))
# Initilise data.
- if not hasattr(self.relax.data.res[self.run][index], 'csa') or
not hasattr(self.relax.data.res[self.run][index], 'csa'):
+ if not hasattr(self.relax.data.res[self.run][index], 'csa') or
not hasattr(self.relax.data.res[self.run][index], 'r'):
self.data_init(self.relax.data.res[self.run][index])
# CSA and Bond length.
r3348 - in /1.2: ./ specific_fns/jw_mapping.py