1 |
jlec 13/11/29 10:58:25 |
2 |
|
3 |
Added: relax-3.1.0-sample-script-backport.patch |
4 |
Log: |
5 |
sci-chemistry/relax: Add another backport for sample scripts; add live ebuild |
6 |
|
7 |
(Portage version: 2.2.7/cvs/Linux x86_64, RepoMan options: --force, signed Manifest commit with key B9D4F231BD1558AB!) |
8 |
|
9 |
Revision Changes Path |
10 |
1.1 sci-chemistry/relax/files/relax-3.1.0-sample-script-backport.patch |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/relax/files/relax-3.1.0-sample-script-backport.patch?rev=1.1&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-chemistry/relax/files/relax-3.1.0-sample-script-backport.patch?rev=1.1&content-type=text/plain |
14 |
|
15 |
Index: relax-3.1.0-sample-script-backport.patch |
16 |
=================================================================== |
17 |
--- trunk/sample_scripts/relax_disp/R1rho_analysis.py 2013/11/29 09:40:25 21705 |
18 |
+++ trunk/sample_scripts/relax_disp/R1rho_analysis.py 2013/11/29 09:42:22 21706 |
19 |
@@ -58,16 +58,16 @@ |
20 |
# Set up the data pipe. |
21 |
####################### |
22 |
|
23 |
+# The path to the data files. |
24 |
+DATA_PATH = '../../test_suite/shared_data/dispersion/r1rho_off_res_tp02' |
25 |
+ |
26 |
# Create the data pipe. |
27 |
pipe_name = 'base pipe' |
28 |
pipe_bundle = 'relax_disp' |
29 |
pipe.create(pipe_name=pipe_name, bundle=pipe_bundle, pipe_type='relax_disp') |
30 |
|
31 |
-# The path to the data files. |
32 |
-data_path = 'r1rho_off_res_tp02' |
33 |
- |
34 |
# Load the sequence. |
35 |
-sequence.read('fake_sequence.in', res_num_col=1, res_name_col=2) |
36 |
+sequence.read('fake_sequence.in', dir=DATA_PATH, res_num_col=1, res_name_col=2) |
37 |
|
38 |
# Name the spins so they can be matched to the assignments. |
39 |
spin.name(name='N') |
40 |
@@ -77,37 +77,37 @@ |
41 |
|
42 |
# The spectral data - spectrum ID, peak list file name, spin-lock field strength (Hz), the spin-lock offset (ppm), the relaxation time (s), spectrometer frequency (Hz), and experimental error (RMSD of the base plane noise for each spectrum). |
43 |
data = [ |
44 |
- ['ref_500MHz', 'ref_500MHz.list', None, 110.0, 0.1, 500e6, 200000.0] |
45 |
- ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0] |
46 |
- ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0] |
47 |
- ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0] |
48 |
- ['nu_2500.0_500MHz', 'nu_2500.0_500MHz.list', 2500.0, 110.0, 0.1, 500e6, 200000.0] |
49 |
- ['nu_3000.0_500MHz', 'nu_3000.0_500MHz.list', 3000.0, 110.0, 0.1, 500e6, 200000.0] |
50 |
- ['nu_3500.0_500MHz', 'nu_3500.0_500MHz.list', 3500.0, 110.0, 0.1, 500e6, 200000.0] |
51 |
- ['nu_4000.0_500MHz', 'nu_4000.0_500MHz.list', 4000.0, 110.0, 0.1, 500e6, 200000.0] |
52 |
- ['nu_4500.0_500MHz', 'nu_4500.0_500MHz.list', 4500.0, 110.0, 0.1, 500e6, 200000.0] |
53 |
- ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0] |
54 |
- ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0] |
55 |
- ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0] |
56 |
- ['ref_800MHz', 'ref_800MHz.list', None, 110.0, 0.1, 800e6, 200000.0] |
57 |
- ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0] |
58 |
- ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0] |
59 |
- ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0] |
60 |
- ['nu_2500.0_800MHz', 'nu_2500.0_800MHz.list', 2500.0, 110.0, 0.1, 800e6, 200000.0] |
61 |
- ['nu_3000.0_800MHz', 'nu_3000.0_800MHz.list', 3000.0, 110.0, 0.1, 800e6, 200000.0] |
62 |
- ['nu_3500.0_800MHz', 'nu_3500.0_800MHz.list', 3500.0, 110.0, 0.1, 800e6, 200000.0] |
63 |
- ['nu_4000.0_800MHz', 'nu_4000.0_800MHz.list', 4000.0, 110.0, 0.1, 800e6, 200000.0] |
64 |
- ['nu_4500.0_800MHz', 'nu_4500.0_800MHz.list', 4500.0, 110.0, 0.1, 800e6, 200000.0] |
65 |
- ['nu_5000.0_800MHz', 'nu_5000.0_800MHz.list', 5000.0, 110.0, 0.1, 800e6, 200000.0] |
66 |
- ['nu_5500.0_800MHz', 'nu_5500.0_800MHz.list', 5500.0, 110.0, 0.1, 800e6, 200000.0] |
67 |
+ ['ref_500MHz', 'ref_500MHz.list', None, 110.0, 0.1, 500e6, 200000.0], |
68 |
+ ['nu_1000.0_500MHz', 'nu_1000.0_500MHz.list', 1000.0, 110.0, 0.1, 500e6, 200000.0], |
69 |
+ ['nu_1500.0_500MHz', 'nu_1500.0_500MHz.list', 1500.0, 110.0, 0.1, 500e6, 200000.0], |
70 |
+ ['nu_2000.0_500MHz', 'nu_2000.0_500MHz.list', 2000.0, 110.0, 0.1, 500e6, 200000.0], |
71 |
+ ['nu_2500.0_500MHz', 'nu_2500.0_500MHz.list', 2500.0, 110.0, 0.1, 500e6, 200000.0], |
72 |
+ ['nu_3000.0_500MHz', 'nu_3000.0_500MHz.list', 3000.0, 110.0, 0.1, 500e6, 200000.0], |
73 |
+ ['nu_3500.0_500MHz', 'nu_3500.0_500MHz.list', 3500.0, 110.0, 0.1, 500e6, 200000.0], |
74 |
+ ['nu_4000.0_500MHz', 'nu_4000.0_500MHz.list', 4000.0, 110.0, 0.1, 500e6, 200000.0], |
75 |
+ ['nu_4500.0_500MHz', 'nu_4500.0_500MHz.list', 4500.0, 110.0, 0.1, 500e6, 200000.0], |
76 |
+ ['nu_5000.0_500MHz', 'nu_5000.0_500MHz.list', 5000.0, 110.0, 0.1, 500e6, 200000.0], |
77 |
+ ['nu_5500.0_500MHz', 'nu_5500.0_500MHz.list', 5500.0, 110.0, 0.1, 500e6, 200000.0], |
78 |
+ ['nu_6000.0_500MHz', 'nu_6000.0_500MHz.list', 6000.0, 110.0, 0.1, 500e6, 200000.0], |
79 |
+ ['ref_800MHz', 'ref_800MHz.list', None, 110.0, 0.1, 800e6, 200000.0], |
80 |
+ ['nu_1000.0_800MHz', 'nu_1000.0_800MHz.list', 1000.0, 110.0, 0.1, 800e6, 200000.0], |
81 |
+ ['nu_1500.0_800MHz', 'nu_1500.0_800MHz.list', 1500.0, 110.0, 0.1, 800e6, 200000.0], |
82 |
+ ['nu_2000.0_800MHz', 'nu_2000.0_800MHz.list', 2000.0, 110.0, 0.1, 800e6, 200000.0], |
83 |
+ ['nu_2500.0_800MHz', 'nu_2500.0_800MHz.list', 2500.0, 110.0, 0.1, 800e6, 200000.0], |
84 |
+ ['nu_3000.0_800MHz', 'nu_3000.0_800MHz.list', 3000.0, 110.0, 0.1, 800e6, 200000.0], |
85 |
+ ['nu_3500.0_800MHz', 'nu_3500.0_800MHz.list', 3500.0, 110.0, 0.1, 800e6, 200000.0], |
86 |
+ ['nu_4000.0_800MHz', 'nu_4000.0_800MHz.list', 4000.0, 110.0, 0.1, 800e6, 200000.0], |
87 |
+ ['nu_4500.0_800MHz', 'nu_4500.0_800MHz.list', 4500.0, 110.0, 0.1, 800e6, 200000.0], |
88 |
+ ['nu_5000.0_800MHz', 'nu_5000.0_800MHz.list', 5000.0, 110.0, 0.1, 800e6, 200000.0], |
89 |
+ ['nu_5500.0_800MHz', 'nu_5500.0_800MHz.list', 5500.0, 110.0, 0.1, 800e6, 200000.0], |
90 |
['nu_6000.0_800MHz', 'nu_6000.0_800MHz.list', 6000.0, 110.0, 0.1, 800e6, 200000.0] |
91 |
] |
92 |
|
93 |
# Loop over the spectra. |
94 |
for id, file, field, offset, relax_time, H_frq, rmsd in data: |
95 |
# Load the peak intensities and set the errors. |
96 |
- spectrum.read_intensities(file=file, dir=data_path, spectrum_id=id, int_method='height') |
97 |
- spectrum.baseplane_rmsd(spectrum_id=id, error=error) |
98 |
+ spectrum.read_intensities(file=file, dir=DATA_PATH, spectrum_id=id, int_method='height') |
99 |
+ spectrum.baseplane_rmsd(spectrum_id=id, error=rmsd) |
100 |
|
101 |
# Set the relaxation dispersion experiment type. |
102 |
relax_disp.exp_type(spectrum_id=id, exp_type='R1rho') |
103 |
@@ -125,18 +125,17 @@ |
104 |
spectrometer.frequency(id=id, frq=H_frq) |
105 |
|
106 |
# Load the R1 data. |
107 |
-relax_data.read(ri_id='500MHz', ri_type='R1', frq=500e6, file='R1_500MHz.out', dir=data_path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) |
108 |
-relax_data.read(ri_id='800MHz', ri_type='R1', frq=800e6, file='R1_800MHz.out', dir=data_path, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) |
109 |
+relax_data.read(ri_id='500MHz', ri_type='R1', frq=500e6, file='R1_500MHz.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) |
110 |
+relax_data.read(ri_id='800MHz', ri_type='R1', frq=800e6, file='R1_800MHz.out', dir=DATA_PATH, mol_name_col=1, res_num_col=2, res_name_col=3, spin_num_col=4, spin_name_col=5, data_col=6, error_col=7) |
111 |
|
112 |
-# Clustering. |
113 |
-relax_disp.cluster(cluster_id='cluster', spin_id=':1-50') |
114 |
+# Clustering (only to be activated after an initial analysis without clustering). |
115 |
+#relax_disp.cluster(cluster_id='cluster', spin_id=':1-50') |
116 |
|
117 |
# Read the chemical shift data. |
118 |
-chemical_shift.read(file='ref_500MHz.list', dir=data_path) |
119 |
+chemical_shift.read(file='ref_500MHz.list', dir=DATA_PATH) |
120 |
|
121 |
# Deselect unresolved spins. |
122 |
-deselect.read(file='unresolved', dir='500_MHz', res_num_col=1) |
123 |
-deselect.read(file='unresolved', dir='800_MHz', res_num_col=1) |
124 |
+deselect.read(file='unresolved', dir=DATA_PATH, res_num_col=1) |