Author: bugman
Date: Thu Jan 26 11:26:01 2012
New Revision: 15260
URL: http://svn.gna.org/viewcvs/relax?rev=15260&view=rev
Log:
Merged revisions 15245-15249,15254-15258 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3
........
r15245 | bugman | 2012-01-25 14:24:25 +0100 (Wed, 25 Jan 2012) | 3 lines
Indentation fix.
........
r15246 | bugman | 2012-01-25 14:32:40 +0100 (Wed, 25 Jan 2012) | 5 lines
Modified the J(w) mapping test data to include relaxation values of None.
This should trigger bug #19329 (https://gna.org/bugs/index.php?19329) in
the test suite.
........
r15247 | bugman | 2012-01-25 14:39:13 +0100 (Wed, 25 Jan 2012) | 6 lines
Fix for bug #19329 (https://gna.org/bugs/index.php?19329).
The spin is now deselected if there is really less than three data points,
excluding data points of
None.
........
r15248 | bugman | 2012-01-25 14:43:54 +0100 (Wed, 25 Jan 2012) | 3 lines
Added some value.write user functions to the J(w) mapping sample script.
........
r15249 | bugman | 2012-01-25 14:50:54 +0100 (Wed, 25 Jan 2012) | 3 lines
Added value.write uf calls to the J(w) mapping system test script.
........
r15254 | bugman | 2012-01-26 08:48:20 +0100 (Thu, 26 Jan 2012) | 5 lines
Bug fix for the consistency testing analysis for when relaxation data of
None is encountered.
This matches the changes of r15247 for the J(w) mapping analysis.
........
r15255 | bugman | 2012-01-26 10:32:55 +0100 (Thu, 26 Jan 2012) | 8 lines
Big bugfix for the value.read user function.
This is for bug #19332 (https://gna.org/bugs/?19332).
The problem was that the wrong spin ID string was being used to set the
parameter value so that
all spins have the same value set for the parameter.
........
r15256 | bugman | 2012-01-26 10:43:07 +0100 (Thu, 26 Jan 2012) | 6 lines
Fixes for the Dasha use functions for file creation and data extraction.
This should now handle relaxation data values of None, and also set the
parameter values of
deselected spins using the Dasha output files.
........
r15257 | bugman | 2012-01-26 10:44:26 +0100 (Thu, 26 Jan 2012) | 5 lines
Fixes for the Dasha system test for the bug #19332 fix
(https://gna.org/bugs/?19332).
The parameter values should be different for each spin! And the chi2 value
is spin specific.
........
r15258 | bugman | 2012-01-26 11:24:42 +0100 (Thu, 26 Jan 2012) | 6 lines
Bug fix for the model-free analysis for when relaxation data of None is
encountered.
This matches the changes of r15247 for the J(w) mapping analysis. This bug
would rarely be
encountered.
........
Modified:
branches/frame_order_testing/ (props changed)
branches/frame_order_testing/generic_fns/dasha.py
branches/frame_order_testing/generic_fns/value.py
branches/frame_order_testing/sample_scripts/jw_mapping.py
branches/frame_order_testing/specific_fns/consistency_tests.py
branches/frame_order_testing/specific_fns/jw_mapping.py
branches/frame_order_testing/specific_fns/model_free/main.py
branches/frame_order_testing/test_suite/shared_data/jw_mapping/R1.dat
branches/frame_order_testing/test_suite/shared_data/jw_mapping/R2.dat
branches/frame_order_testing/test_suite/shared_data/jw_mapping/noe.dat
branches/frame_order_testing/test_suite/system_tests/dasha.py
branches/frame_order_testing/test_suite/system_tests/scripts/jw_mapping.py
[This mail would be too long, it was shortened to contain the URLs only.]
Modified: branches/frame_order_testing/generic_fns/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/dasha.py?rev=15260&r1=15259&r2=15260&view=diff
Modified: branches/frame_order_testing/generic_fns/value.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/generic_fns/value.py?rev=15260&r1=15259&r2=15260&view=diff
Modified: branches/frame_order_testing/sample_scripts/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/sample_scripts/jw_mapping.py?rev=15260&r1=15259&r2=15260&view=diff
Modified: branches/frame_order_testing/specific_fns/consistency_tests.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/consistency_tests.py?rev=15260&r1=15259&r2=15260&view=diff
Modified: branches/frame_order_testing/specific_fns/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/jw_mapping.py?rev=15260&r1=15259&r2=15260&view=diff
Modified: branches/frame_order_testing/specific_fns/model_free/main.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/specific_fns/model_free/main.py?rev=15260&r1=15259&r2=15260&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/jw_mapping/R1.dat
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/jw_mapping/R1.dat?rev=15260&r1=15259&r2=15260&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/jw_mapping/R2.dat
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/jw_mapping/R2.dat?rev=15260&r1=15259&r2=15260&view=diff
Modified:
branches/frame_order_testing/test_suite/shared_data/jw_mapping/noe.dat
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/shared_data/jw_mapping/noe.dat?rev=15260&r1=15259&r2=15260&view=diff
Modified: branches/frame_order_testing/test_suite/system_tests/dasha.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/dasha.py?rev=15260&r1=15259&r2=15260&view=diff
Modified:
branches/frame_order_testing/test_suite/system_tests/scripts/jw_mapping.py
URL:
http://svn.gna.org/viewcvs/relax/branches/frame_order_testing/test_suite/system_tests/scripts/jw_mapping.py?rev=15260&r1=15259&r2=15260&view=diff
r15260 - in /branches/frame_order_testing: ./ generic_fns/ sample_scripts/ specific_fns/ specific_fns/model_free/ test_suite...