Author: bugman
Date: Tue Jan 14 12:02:18 2014
New Revision: 21978
URL: http://svn.gna.org/viewcvs/relax?rev=21978&view=rev
Log:
Merged revisions 21964-21966,21970 via svnmerge from
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk
........
r21964 | bugman | 2014-01-13 11:45:43 +0100 (Mon, 13 Jan 2014) | 3 lines
Updated the copyright for the relax GUI splash screen for 2014.
........
r21965 | bugman | 2014-01-13 11:55:16 +0100 (Mon, 13 Jan 2014) | 6 lines
Improvement for the relax test suite printout with the --time command line
argument flag.
The tests printed out now have the package and module names removed, so
that one the test name
remains. This removes a large amount of text, simplifying the printout.
........
r21966 | bugman | 2014-01-13 13:23:04 +0100 (Mon, 13 Jan 2014) | 5 lines
Loosened the chi2 check in the Relax_disp.test_korzhnev_2005_15n_mq_data
system test.
This is to allow the test to pass on a 32-bit Linux (Mageia 1) test system.
........
r21970 | bugman | 2014-01-13 15:06:44 +0100 (Mon, 13 Jan 2014) | 6 lines
Backported the relax 3.1.2 CHANGES file addition to trunk.
The command used was:
svn merge -r21967:21969 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/tags/3.1.2 .
........
Modified:
branches/double_rotor/ (props changed)
branches/double_rotor/docs/CHANGES
branches/double_rotor/graphics/misc/relaxGUI_splash.png
branches/double_rotor/graphics/misc/relaxGUI_splash.xcf
branches/double_rotor/test_suite/relax_test_runner.py
branches/double_rotor/test_suite/system_tests/relax_disp.py
Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Jan 14 12:02:18 2014
@@ -1,1 +1,1 @@
-/trunk:1-21962
+/trunk:1-21977
Modified: branches/double_rotor/docs/CHANGES
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/docs/CHANGES?rev=21978&r1=21977&r2=21978&view=diff
==============================================================================
--- branches/double_rotor/docs/CHANGES (original)
+++ branches/double_rotor/docs/CHANGES Tue Jan 14 12:02:18 2014
@@ -1,3 +1,33 @@
+Version 3.1.2
+(13 January 2014, from /trunk)
+http://svn.gna.org/svn/relax/tags/3.1.2
+
+ Features:
+ N/A
+
+
+ Changes:
+ * The average_intensity() dispersion function now accepts the offset
argument. This is for better support of combined offset and spin-lock varied
R1rho-type data. The argument is then passed into the find_intensity_keys()
function.
+ * Improved the DPL94 dispersion model description in the manual.
+ * Copied a Sparky peak list to be modified to be a Sparky file
without intensity column.
+ * Modified the Sparky file to have no columns with intensity values.
+ * Implemented to read spins from a SPARKY list, when no intensity
column is present. Addition to Support Request #3044,
(https://gna.org/support/index.php?3044) - load spins from Sparky list.
+ * Created the Relax_disp.test_bug_21460_disp_cluster_fail system
test. This is to catch bug #21460 (https://gna.org/bugs/?21460) reported by
Min-Kyu Cho. The save file added to the repository consists solely of the
data for the first residue.
+ * Speed ups for the Relax_disp.test_bug_21460_disp_cluster_fail
system test. The optimisation precision is not important for demonstrating
this bug.
+ * Updated the main copyright notice for 2014.
+ * Fix for the main copyright notice.
+ * Updated the copyright notice visible to the user to 2014.
+ * Updated the copyright for the relax GUI splash screen for 2014.
+ * Improvement for the relax test suite printout with the --time
command line argument flag. The tests printed out now have the package and
module names removed, so that one the test name remains. This removes a
large amount of text, simplifying the printout.
+
+
+ Bugfixes:
+ * Partial fix for bug #21338 (https://gna.org/bugs/?21338) - the bad
sRGB profile in some PNGs. This is only partial as some files are still to
be converted (the original Bruker logo, and the 16x16, 22x22 and 32x32 sized
Bruker icons).
+ * Fix for bug #21460, the failure of relaxation dispersion due to
incorrect spectrometer information. This is the bug
https://gna.org/bugs/?21460, reported by Min-Kyu Cho. There was only one
place in the dispersion analysis which failed due to a spectrometer frequency
not containing any relaxation data - in the insignificance testing in the
auto-analysis.
+ * Loosened the chi2 check in the
Relax_disp.test_korzhnev_2005_15n_mq_data system test. This is to allow the
test to pass on a 32-bit Linux (Mageia 1) test system.
+
+
+
Version 3.1.1
(10 December 2013, from /trunk)
http://svn.gna.org/svn/relax/tags/3.1.1
Modified: branches/double_rotor/graphics/misc/relaxGUI_splash.png
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/graphics/misc/relaxGUI_splash.png?rev=21978&r1=21977&r2=21978&view=diff
==============================================================================
Binary files - no diff available.
Modified: branches/double_rotor/graphics/misc/relaxGUI_splash.xcf
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/graphics/misc/relaxGUI_splash.xcf?rev=21978&r1=21977&r2=21978&view=diff
==============================================================================
Binary files - no diff available.
Modified: branches/double_rotor/test_suite/relax_test_runner.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/relax_test_runner.py?rev=21978&r1=21977&r2=21978&view=diff
==============================================================================
--- branches/double_rotor/test_suite/relax_test_runner.py (original)
+++ branches/double_rotor/test_suite/relax_test_runner.py Tue Jan 14 12:02:18
2014
@@ -163,6 +163,10 @@
# Subtract the end time from the start time.
self.time -= time()
+ # Change the test name.
+ test_name = test_name.split('.')
+ test_name = "%s.%s" % (test_name[-2], test_name[-1])
+
# The printout.
self.stream.write(' %7.2f s for %s.\n' % (-self.time, test_name))
Modified: branches/double_rotor/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/branches/double_rotor/test_suite/system_tests/relax_disp.py?rev=21978&r1=21977&r2=21978&view=diff
==============================================================================
--- branches/double_rotor/test_suite/system_tests/relax_disp.py (original)
+++ branches/double_rotor/test_suite/system_tests/relax_disp.py Tue Jan 14
12:02:18 2014
@@ -1677,7 +1677,7 @@
self.assertAlmostEqual(spin.dw, 4.33890689462363, 2)
self.assertAlmostEqual(spin.dwH, -0.274316585638047, 3)
self.assertAlmostEqual(spin.kex/1000, 344.329651956132/1000, 3)
- self.assertAlmostEqual(spin.chi2, 10.3654315659173, 3)
+ self.assertAlmostEqual(spin.chi2, 10.3654315659173, 2)
def test_korzhnev_2005_15n_sq_data(self):
r21978 - in /branches/double_rotor: ./ docs/ graphics/misc/ test_suite/ test_suite/system_tests/