Author: bugman
Date: Wed Mar 27 14:24:05 2013
New Revision: 19208
URL: http://svn.gna.org/viewcvs/relax?rev=19208&view=rev
Log:
Ported r8389 from the old relax_disp branch into the new branch.
The command used was:
svn merge -r8388:8389
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 .
.....
r8389 | semor | 2009-01-11 18:28:31 +0100 (Sun, 11 Jan 2009) | 6 lines
Changed paths:
D
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1:8362)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/1000.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/1
000.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/133.33.in.bis_sparky
(from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datas
et_1/133.33.in.bis_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/133.33.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/133.33.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/200.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/20
0.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/266.67.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/266.67.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/333.33.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/333.33.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/400.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/40
0.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/466.67.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/466.67.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/533.33.in.bis_sparky
(from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datas
et_1/533.33.in.bis_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/533.33.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/533.33.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/600.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/60
0.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/66.667.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/66.667.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/666.67.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/666.67.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/733.33.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/733.33.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/800.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/80
0.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/866.67.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/866.67.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/933.33.in.bis_sparky
(from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datas
et_1/933.33.in.bis_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/933.33.in_sparky
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1
/933.33.in_sparky:8363)
R
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/readme
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/readme:83
63)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/reference.in_sparky
(from /branches/relax_disp/test_suite/shared_data/curve_fitting_disp/datase
t_1/reference.in_sparky:8363)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/unresolved
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/unres
olved:8365)
M
/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
M
/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
Added details to the readme file and changed the directory name where the
sample data is located.
The directory is now named 'dataset_1-a'. This contains data recorded at
500 MHz. Data recorded at
800 MHz will be put in a directory called 'dataset_1-b'.
.....
Added:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/
(props changed)
- copied from r8389,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/
Removed:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1/
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
Propchange:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/dataset_1-a/
------------------------------------------------------------------------------
svn:mergeinfo =
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=19208&r1=19207&r2=19208&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:24:05 2013
@@ -7,10 +7,10 @@
pipe.create('rex', 'relax_disp')
# The path to the data files.
-data_path = sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1'
+data_path = sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1-a'
# Load the sequence.
-sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1')
+sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1-a')
# Name the spins so they can be matched to the assignments.
spin.name(name='N')
Modified:
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py?rev=19208&r1=19207&r2=19208&view=diff
==============================================================================
---
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
(original)
+++
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_slow.py
Wed Mar 27 14:24:05 2013
@@ -7,10 +7,10 @@
pipe.create('rex', 'relax_disp')
# The path to the data files.
-data_path = sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1'
+data_path = sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1-a'
# Load the sequence.
-sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1')
+sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/dataset_1-a')
# Name the spins so they can be matched to the assignments.
spin.name(name='N')
r19208 - in /branches/relax_disp/test_suite: shared_data/curve_fitting_disp/dataset_1-a/ shared_data/curve_fitting_disp/data...