Hi Troels,
Again for preparing the release notes (e.g.
http://wiki.nmr-relax.com/Relax_3.3.0#CHANGES_file), could you prepare
the commit message as follows:
- The 'task', 'bug', or 'sr' reference on its own line should be
capitalised. This is so it makes a proper sentence in the release
notes, and I don't have to change it manually later (you have a lot of
these).
- Please add a space before the bracket. For example "task
#7826(https://gna.org/task/index.php?7826)" should be "Task #7826
(https://gna.org/task/index.php?7826)". This is one I spend a lot of
time changing for the notes.
- The software Python always starts with a capital 'P'. Software
names are strange in that way. For example PyMOL, MOLMOL, xmGrace,
nmrPipe, showApod, relax, etc.
If you could remember these rules for your next commit messages, you
would really be helping me a lot!
Cheers!
Edward
On 3 September 2014 22:50, <tlinnet@xxxxxxxxxxxxx> wrote:
Author: tlinnet
Date: Wed Sep 3 22:50:44 2014
New Revision: 25608
URL: http://svn.gna.org/viewcvs/relax?rev=25608&view=rev
Log:
Systemtest added for checking the writing of 'Noise Std Dev' from showApod
to file.
task #7826(https://gna.org/task/index.php?7826): Write an python class for
the repeated analysis of dispersion data.
Modified:
trunk/test_suite/system_tests/relax_disp.py
Modified: trunk/test_suite/system_tests/relax_disp.py
URL:
http://svn.gna.org/viewcvs/relax/trunk/test_suite/system_tests/relax_disp.py?rev=25608&r1=25607&r2=25608&view=diff
==============================================================================
--- trunk/test_suite/system_tests/relax_disp.py (original)
+++ trunk/test_suite/system_tests/relax_disp.py Wed Sep 3 22:50:44 2014
@@ -35,8 +35,8 @@
from data_store import Relax_data_store; ds = Relax_data_store()
import dep_check
from lib.errors import RelaxError
-from lib.io import get_file_path
-from lib.spectrum.nmrpipe import show_apod_extract, show_apod_rmsd
+from lib.io import extract_data, get_file_path
+from lib.spectrum.nmrpipe import show_apod_extract, show_apod_rmsd,
show_apod_rmsd_to_file
from pipe_control.mol_res_spin import generate_spin_string, return_spin,
spin_loop
from pipe_control.minimise import assemble_scaling_matrix
from specific_analyses.relax_disp.checks import check_missing_r1
@@ -112,7 +112,8 @@
# The list of tests to skip.
to_skip = [
"test_show_apod_extract",
- "test_show_apod_rmsd"
+ "test_show_apod_rmsd",
+ "test_show_apod_rmsd_to_file"
]
# Store in the status object.
@@ -6754,6 +6755,28 @@
self.assertEqual(rmsd, 8583.41)
+ def test_show_apod_rmsd_to_file(self):
+ """Test getting the spectrum noise for spectrum fourier
transformed with NMRPipe, and tool showApod, and write to file."""
+
+ # The path to the data files.
+ data_path = status.install_path +
sep+'test_suite'+sep+'shared_data'+sep+'dispersion'+sep+'repeated_analysis'+sep+'SOD1'+sep+'cpmg_disp_sod1d90a_060518'+sep+'cpmg_disp_sod1d90a_060518_normal.fid'+sep+'ft2_data'
+
+ # Define file name.
+ file_name = '128_0_FT.ft2'
+
+ # Call function, and get file name.
+ wfile_path = show_apod_rmsd_to_file(file_name=file_name,
dir=data_path, outdir=self.tmpdir)
+
+ # Open the file.
+ get_data = extract_data(file=wfile_path)
+
+ # Extract line 0, column 0.
+ test = float(get_data[0][0])
+
+ # Assert.
+ self.assertEqual(test, 8583.41)
+
+
def test_sod1wt_t25_bug_21954_order_error_analysis(self):
"""Error analysis of SOD1-WT CPMG. From paper at
U{http://dx.doi.org/10.1073/pnas.0907387106}.
_______________________________________________
relax (http://www.nmr-relax.com)
This is the relax-commits mailing list
relax-commits@xxxxxxx
To unsubscribe from this list, get a password
reminder, or change your subscription options,
visit the list information page at
https://mail.gna.org/listinfo/relax-commits
Re: r25608 - /trunk/test_suite/system_tests/relax_disp.py