Author: bugman Date: Wed Jul 30 17:37:27 2014 New Revision: 24842 URL: http://svn.gna.org/viewcvs/relax?rev=24842&view=rev Log: Merged revisions 24841 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk ........ r24841 | bugman | 2014-07-30 17:33:22 +0200 (Wed, 30 Jul 2014) | 6 lines Grace string fixes for the alignment tensor parameters defined in the base parameter_object module. This is essentially for allowing relax to run using Python 3. All Grace '\' characters need to be escaped as '\\' in Python strings. ........ Modified: branches/frame_order_cleanup/ (props changed) branches/frame_order_cleanup/specific_analyses/parameter_object.py Propchange: branches/frame_order_cleanup/ ------------------------------------------------------------------------------ --- svnmerge-integrated (original) +++ svnmerge-integrated Wed Jul 30 17:37:27 2014 @@ -1 +1 @@ -/trunk:1-24837 +/trunk:1-24841 Modified: branches/frame_order_cleanup/specific_analyses/parameter_object.py URL: http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/specific_analyses/parameter_object.py?rev=24842&r1=24841&r2=24842&view=diff ============================================================================== --- branches/frame_order_cleanup/specific_analyses/parameter_object.py (original) +++ branches/frame_order_cleanup/specific_analyses/parameter_object.py Wed Jul 30 17:37:27 2014 @@ -249,7 +249,7 @@ set = 'params', grid_lower = -1e-3, grid_upper = 1e-3, - grace_string = '\qA\sxx\N', + grace_string = '\\qA\\sxx\\N', err = True, sim = True ) @@ -261,7 +261,7 @@ set = 'params', grid_lower = -1e-3, grid_upper = 1e-3, - grace_string = '\qA\syy\N', + grace_string = '\\qA\\syy\\N', err = True, sim = True ) @@ -273,7 +273,7 @@ set = 'params', grid_lower = -1e-3, grid_upper = 1e-3, - grace_string = '\qA\sxy\N', + grace_string = '\\qA\\sxy\\N', err = True, sim = True ) @@ -285,7 +285,7 @@ set = 'params', grid_lower = -1e-3, grid_upper = 1e-3, - grace_string = '\qA\sxz\N', + grace_string = '\\qA\\sxz\\N', err = True, sim = True ) @@ -297,7 +297,7 @@ set = 'params', grid_lower = -1e-3, grid_upper = 1e-3, - grace_string = '\qA\syz\N', + grace_string = '\\qA\\syz\\N', err = True, sim = True )