r4587 - in /branches/N_state_model: ./ data/ generic_fns/ specific_fns/ specific_fns/model_free/r4587 - in /branches/N_state_model: ./ data/ generic_fns/ specific_fns/ specific_fns/model_free/Author: bugman Date: Thu Jan 10 15:55:09 2008 New Revision: 4587 URL: http://svn.gna.org/viewcvs/relax?rev=4587&view=rev Log: Merged revisions 4575-4586 via svnmerge from svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3 ........ r4575 | semor | 2008-01-09 19:20:33 +0100 (Wed, 09 Jan 2008) | 10 lines Changed almost all instances of the 'print_flag' arg to 'verbosity' in the specific_fns directory. Exceptions were made for instances in generic_minimise() functions where 'print_flag=print_flag' becomes 'print_flag=verbosity'. This was pointed out in a post by Edward d'Auvergne at : https://mail.gna.org/public/relax-devel/2008-01/msg00021.html (Message-id: <7f080ed10801090840s341431f2nb75b15b137b46176@xxxxxxxxxxxxxx>) ........ r4576 | semor | 2008-01-09 19:28:21 +0100 (Wed, 09 Jan 2008) | 10 lines Completed the changes from the previous commit (4575) as the model_free directory had been skipped. Changed almost all instances of the 'print_flag' arg to 'verbosity' in the specific_fns/model_free directory. Exceptions were made for instances in generic_minimise() functions where 'print_flag=print_flag' becomes 'print_flag=verbosity'. This was pointed out in a post by Edward d'Auvergne at : https://mail.gna.org/public/relax-devel/2008-01/msg00021.html (Message-id: <7f080ed10801090840s341431f2nb75b15b137b46176@xxxxxxxxxxxxxx>) ........ r4577 | semor | 2008-01-09 19:32:12 +0100 (Wed, 09 Jan 2008) | 3 lines Changed all instances of the 'print_flag' arg to 'verbosity' in 'relax_io.py'. ........ r4579 | semor | 2008-01-09 19:41:37 +0100 (Wed, 09 Jan 2008) | 3 lines Fixed a typo that was introduced in the 4576 commit. ........ r4585 | bugman | 2008-01-10 14:35:02 +0100 (Thu, 10 Jan 2008) | 22 lines Manually ported r4584 from the 1.2 line - the fix to bug #8997 (https://gna.org/bugs/?8997). The command used was: svn merge -r4583:4584 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2 ..... r4584 | bugman | 2008-01-10 14:30:10 +0100 (Thu, 10 Jan 2008) | 11 lines Changed paths: M /1.2/generic_fns/palmer.py Fix for bug #8997 (https://gna.org/bugs/index.php?8997). This bug was reported by Carl Diehl (carl dot diehl at bpc dot lu dot se). The problem was because of a change between relax versions 1.0 and 1.2. Previously the residue number was being searched for, but the changes used the absolute position to significantly speed up the code. But the absolute positions are different in a Modelfree 'mfout' file if simulations are run. The absolute position in this situation is now properly calculated and the test data attached to the bug report by Seb now works. ..... ........ r4586 | bugman | 2008-01-10 15:54:12 +0100 (Thu, 10 Jan 2008) | 3 lines Removed a few empty __init__() class methods and shifted their docstrings to the class docstring. ........ Modified: branches/N_state_model/ (props changed) branches/N_state_model/data/data_classes.py branches/N_state_model/data/diff_tensor.py branches/N_state_model/generic_fns/palmer.py branches/N_state_model/relax_io.py branches/N_state_model/specific_fns/jw_mapping.py branches/N_state_model/specific_fns/model_free/model_free.py branches/N_state_model/specific_fns/noe.py branches/N_state_model/specific_fns/relax_fit.py [This mail would be too long, it was shortened to contain the URLs only.] Modified: branches/N_state_model/data/data_classes.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/data/data_classes.py?rev=4587&r1=4586&r2=4587&view=diff Modified: branches/N_state_model/data/diff_tensor.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/data/diff_tensor.py?rev=4587&r1=4586&r2=4587&view=diff Modified: branches/N_state_model/generic_fns/palmer.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/palmer.py?rev=4587&r1=4586&r2=4587&view=diff Modified: branches/N_state_model/relax_io.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/relax_io.py?rev=4587&r1=4586&r2=4587&view=diff Modified: branches/N_state_model/specific_fns/jw_mapping.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/jw_mapping.py?rev=4587&r1=4586&r2=4587&view=diff Modified: branches/N_state_model/specific_fns/model_free/model_free.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/model_free/model_free.py?rev=4587&r1=4586&r2=4587&view=diff Modified: branches/N_state_model/specific_fns/noe.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/noe.py?rev=4587&r1=4586&r2=4587&view=diff Modified: branches/N_state_model/specific_fns/relax_fit.py URL: http://svn.gna.org/viewcvs/relax/branches/N_state_model/specific_fns/relax_fit.py?rev=4587&r1=4586&r2=4587&view=diff