Author: bugman Date: Wed May 30 18:02:03 2007 New Revision: 3300 URL: http://svn.gna.org/viewcvs/relax?rev=3300&view=rev Log: Blocked revisions 3260,3286,3290,3297 via svnmerge ........ r3260 | macraild | 2007-04-03 19:19:34 +0200 (Tue, 03 Apr 2007) | 4 lines A further attempt to make boolean mol-res-spin selection work. This is still some way from a solution. ........ r3286 | bugman | 2007-05-08 23:04:54 +0200 (Tue, 08 May 2007) | 15 lines Hand ported r3285 from the 1.2 line, the fix for bug #8953 (https://gna.org/bugs/?8953). ..... Fix for bug #8953 (https://gna.org/bugs/?8953). The bug was introduced by a fix to the model-free results writing function. In relax versions 1.2.9 and below, no data about a residue was being stored in the results file if it was deselected. This behaviour undesirable as a spin system could be deselected temporarily and later on reselected. If this process is deliberately interrupted by using 'results.write()' followed by 'results.read()' to resume, then there will be data loss. The fix was simple: check for the presence of the 'data.num_ri' data structure. ..... ........ r3290 | bugman | 2007-05-09 00:50:45 +0200 (Wed, 09 May 2007) | 20 lines Manually ported the relevent part of r3288 (the fix to bug #9101 (https://gna.org/bugs/?9101)). The changes to errors.py and specific_fns/model_free.py were not ported. ..... r3288 | bugman | 2007-05-08 23:48:05 +0200 (Tue, 08 May 2007) | 6 lines Changed paths: M /1.2/errors.py M /1.2/specific_fns/model_free.py M /1.2/specific_fns/relax_data.py Fix for bug #9101 (https://gna.org/bugs/?9101). The relax_data.read() user function was failing when the data or error column contained the text 'None' which is the default output for deselected spin systems in the exponential curve fitting component of relax. This is now fixed. ..... ........ r3297 | bugman | 2007-05-30 17:04:16 +0200 (Wed, 30 May 2007) | 8 lines Fix for bug #9238 (https://gna.org/bugs/?9238). This fatal bug was reported by Sébastien Morin. The fix was slightly different from that posted in the bug report as the factor of 2 pi was still required. ........ Modified: 1.2/ (props changed) Propchange: 1.2/ ------------------------------------------------------------------------------ Binary property 'svnmerge-blocked' - no diff available.