Author: bugman
Date: Wed Mar 27 14:17:17 2013
New Revision: 19203
URL: http://svn.gna.org/viewcvs/relax?rev=19203&view=rev
Log:
Ported r8363 from the old relax_disp branch into the new branch.
The command used was:
svn merge -r8362:8363
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 .
.....
r8363 | semor | 2009-01-10 21:50:01 +0100 (Sat, 10 Jan 2009) | 4 lines
Changed paths:
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/1000.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in.bis_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/200.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/266.67.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/333.33.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/400.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/466.67.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in.bis_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/600.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/66.667.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/666.67.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/733.33.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/800.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/866.67.in_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in.bis_sparky
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in_sparky
M
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/reference.in_sparky
M
/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Added 'Sparky' formatted files to the system-test so the files can be input
and development of the
branch continued.
.....
Added:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/1000.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/1000.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in.bis_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in.bis_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/133.33.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/200.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/200.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/266.67.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/266.67.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/333.33.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/333.33.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/400.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/400.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/466.67.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/466.67.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in.bis_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in.bis_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/533.33.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/600.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/600.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/66.667.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/66.667.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/666.67.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/666.67.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/733.33.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/733.33.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/800.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/800.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/866.67.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/866.67.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in.bis_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in.bis_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/933.33.in_sparky
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/reference.in_sparky
- copied unchanged from r8363,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/reference.in_sparky
Modified:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Modified:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme?rev=19203&r1=19202&r2=19203&view=diff
==============================================================================
---
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme
(original)
+++
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme
Wed Mar 27 14:17:17 2013
@@ -7,3 +7,6 @@
The original format was different and was modified to better suit the way
relax handles datasets.
+The files ending in '_sparky' include both the intensities and chemical
shifts for each residue and
+are formatted similarly to 'Sparky' peak lists.
+
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py?rev=19203&r1=19202&r2=19203&view=diff
==============================================================================
---
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
(original)
+++
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
Wed Mar 27 14:17:17 2013
@@ -20,25 +20,25 @@
# Spectrum names.
names = [
- 'reference.in',
- '66.667.in',
- '1000.in',
- '133.33.in',
- '933.33.in',
- '200.in',
- '866.67.in',
- '266.67.in',
- '800.in',
- '333.33.in',
- '733.33.in',
- '400.in',
- '666.67.in',
- '466.67.in',
- '600.in',
- '533.33.in',
- '133.33.in.bis',
- '933.33.in.bis',
- '533.33.in.bis'
+ 'reference.in_sparky',
+ '66.667.in_sparky',
+ '1000.in_sparky',
+ '133.33.in_sparky',
+ '933.33.in_sparky',
+ '200.in_sparky',
+ '866.67.in_sparky',
+ '266.67.in_sparky',
+ '800.in_sparky',
+ '333.33.in_sparky',
+ '733.33.in_sparky',
+ '400.in_sparky',
+ '666.67.in_sparky',
+ '466.67.in_sparky',
+ '600.in_sparky',
+ '533.33.in_sparky',
+ '133.33.in.bis_sparky',
+ '933.33.in.bis_sparky',
+ '533.33.in.bis_sparky'
]
# Relaxation dispersion CPMG constant time delay T (in s).
r19203 - in /branches/relax_disp/test_suite: shared_data/curve_fitting_disp/dataset_1/ system_tests/scripts/