Author: bugman
Date: Wed Mar 27 14:28:24 2013
New Revision: 19212
URL: http://svn.gna.org/viewcvs/relax?rev=19212&view=rev
Log:
Ported r8395 from the old relax_disp branch into the new branch.
The command used was:
svn merge -r8394:8395
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp@r18123 .
.....
r8395 | semor | 2009-01-11 21:21:13 +0100 (Sun, 11 Jan 2009) | 6 lines
Changed paths:
D
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/fake_sequence.in
D
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme
D
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/readme
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/unresolved
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/fake_sequence.in
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz
/fake_sequence.in:8394)
A
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/readme
(from
/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme:83
94)
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 an 'unresolved' file to the 800 MHz data and moved (and modified)
some files (sequence and
readme) so there is only one copy for the 500 and 800 MHz data.
This prevents duplicated files.
.....
Added:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/unresolved
- copied unchanged from r8395,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/unresolved
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/fake_sequence.in
- copied unchanged from r8395,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/fake_sequence.in
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/readme
- copied unchanged from r8395,
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/readme
Removed:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/fake_sequence.in
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/readme
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
Removed:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/fake_sequence.in
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/fake_sequence.in?rev=19211&view=auto
==============================================================================
---
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/fake_sequence.in
(original)
+++
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/fake_sequence.in
(removed)
@@ -1,73 +1,0 @@
-1 GLY
-2 GLY
-3 GLY
-4 GLY
-5 GLY
-6 GLY
-7 GLY
-8 GLY
-9 GLY
-10 GLY
-11 GLY
-12 GLY
-13 GLY
-14 GLY
-15 GLY
-16 GLY
-17 GLY
-18 GLY
-19 GLY
-20 GLY
-21 GLY
-22 GLY
-23 GLY
-24 GLY
-25 GLY
-26 GLY
-27 GLY
-28 GLY
-29 GLY
-30 GLY
-31 GLY
-32 GLY
-33 GLY
-34 GLY
-35 GLY
-36 GLY
-37 GLY
-38 GLY
-39 GLY
-40 GLY
-41 GLY
-42 GLY
-43 GLY
-44 GLY
-45 GLY
-46 GLY
-47 GLY
-48 GLY
-49 GLY
-50 GLY
-51 GLY
-52 GLY
-53 GLY
-54 GLY
-55 GLY
-56 GLY
-57 GLY
-58 GLY
-59 GLY
-60 GLY
-61 GLY
-62 GLY
-63 GLY
-64 GLY
-65 GLY
-66 GLY
-67 GLY
-68 GLY
-69 GLY
-70 GLY
-71 GLY
-72 GLY
-73 GLY
Removed:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme?rev=19211&view=auto
==============================================================================
---
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme
(original)
+++
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz/readme
(removed)
@@ -1,15 +1,0 @@
-
-The dataset contained in this folder was published in:
- Hansen, Vallurupalli & Kay, 2008, JPhysChemB, 112: 5898-5904.
-
-It contains the data recorded at 500 MHz using the improved pulse sequence
with 1H CW decoupling
-during the CPMG period.
-
-It was was friendly provided by Dr Flemming Hansen.
- flemming AT pound DOT med DOT utoronto DOT ca
-
-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.
-
Removed:
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/readme
URL:
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/readme?rev=19211&view=auto
==============================================================================
---
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/readme
(original)
+++
branches/relax_disp/test_suite/shared_data/curve_fitting_disp/Hansen/800_MHz/readme
(removed)
@@ -1,15 +1,0 @@
-
-The dataset contained in this folder was published in:
- Hansen, Vallurupalli & Kay, 2008, JPhysChemB, 112: 5898-5904.
-
-It contains the data recorded at 800 MHz using the improved pulse sequence
with 1H CW decoupling
-during the CPMG period.
-
-It was was friendly provided by Dr Flemming Hansen.
- flemming AT pound DOT med DOT utoronto DOT ca
-
-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=19212&r1=19211&r2=19212&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:28:24 2013
@@ -10,7 +10,7 @@
data_path = sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz'
# Load the sequence.
-sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz')
+sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/Hansen')
# 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=19212&r1=19211&r2=19212&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:28:24 2013
@@ -10,7 +10,7 @@
data_path = sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz'
# Load the sequence.
-sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/Hansen/500_MHz')
+sequence.read('fake_sequence.in', dir=sys.path[-1] +
'/test_suite/shared_data/curve_fitting_disp/Hansen')
# Name the spins so they can be matched to the assignments.
spin.name(name='N')
r19212 - in /branches/relax_disp/test_suite: shared_data/curve_fitting_disp/Hansen/ shared_data/curve_fitting_disp/Hansen/50...