|
Hi Ed I've checked in the consistency tests code and it seems almost ready to be merged to the main code for line 1.2. I say "almost" since I have 3 patches for solving some details... 1. patch_1.2-r3370_consistency_branch__maths_fns_-_consistency__CSA Changes the default CSA value from -170 to -172 ppm. 2. patch_1.2-r3370_consistency_branch__maths_fns_-_consistency__docstring Adds some text in docstrings or comments. 3. patch_1.2-r3370_consistency_branch__maths_fns_-_consistency__typo Corrects a typo where 'csa' was written instead of 'r'. Thanks for merging this code. I think the next steps will be : a) to add the code to the 1.3 line ; b) to modify the code so datasets from different magnetic fields (at least two) can be input at once and correlation plots made automatically as long as correlation, skewness and kurtosis coefficients calculated also automatically... Cheers Sébastien :) Edward d'Auvergne wrote: On 10/16/07, Sebastien Morin <sebastien.morin.1@xxxxxxxxx> wrote: --
______________________________________
_______________________________________________
| |
|| Sebastien Morin ||
||| Etudiant au PhD en biochimie |||
|||| Laboratoire de resonance magnetique nucleaire ||||
||||| Dr Stephane Gagne |||||
|||| CREFSIP (Universite Laval, Quebec, CANADA) ||||
||| 1-418-656-2131 #4530 |||
|| ||
|_______________________________________________|
______________________________________
|
Index: specific_fns/consistency_tests.py
===================================================================
--- specific_fns/consistency_tests.py (revision 3370)
+++ specific_fns/consistency_tests.py (working copy)
@@ -225,7 +225,7 @@
| | |
|
| Bond length | 'r' | 1.02 *
1e-10 |
| | |
|
- | CSA | 'csa' | -170 *
1e-6 |
+ | CSA | 'csa' | -172 *
1e-6 |
| | |
|
| Angle Theta | 'orientation' | 15.7
|
| | |
|
@@ -240,7 +240,7 @@
# CSA.
if param == 'CSA':
- return -170 * 1e-6
+ return -172 * 1e-6
# Angle Theta
if param == 'orientation':
Index: maths_fns/consistency_tests.py
===================================================================
--- maths_fns/consistency_tests.py (revision 3370)
+++ maths_fns/consistency_tests.py (working copy)
@@ -37,9 +37,14 @@
This code calculates three functions for each residue. When
comparing datasets from
different magnetic field, the value should be the same for each
function as these are field
- field independent. The J(0) function is the spectral density at the
zero frequency and is
- obtained using a reduced spectral density approach. The F_eta and
F_R2 functions are the
+ independent. The J(0) function is the spectral density at the zero
frequency and is obtained
+ using a reduced spectral density approach. The F_eta and F_R2
functions are the
consistency functions proposed by Fushman D. et al. (1998) JACS,
120: 10947-10952.
+
+ To assess the consistency of its datasets, one should first
calculate those values (J(0),
+ F_eta and F_R2) for each field. Then, the user should compare values
obtained for different
+ magnetic fields. Comparisons could proceed using correlation plots
and the user could also
+ calculate correlation, skewness and kurtosis coefficients.
"""
# Initialise the data container.
@@ -109,6 +114,9 @@
# Calculate P_2.
# p_2 is a second rank Legendre polynomial as p_2(x) = 0.5 * (3 * (x
** 2) -1)
# where x is the cosine of the angle Theta when expressed in radians.
+ #
+ # Note that the angle Theta (called 'orientation' in relax) is the
angle between the 15N-1H
+ # vector and the principal axis of the 15N chemical shift tensor.
p_2 = 0.5 * ((3.0 * (cos(orientation * pi / 180)) ** 2) -1)
# Calculate eta.
Index: specific_fns/consistency_tests.py
===================================================================
--- specific_fns/consistency_tests.py (revision 3370)
+++ specific_fns/consistency_tests.py (working copy)
@@ -417,8 +417,8 @@
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
In consistency testing, only four values can be set, the bond
length, CSA, angle
- Theta and correlation time values. These must be set prior to the
calculation
- of consistency functions.
+ Theta ('orientation') and correlation time values. These must be set
prior to the
+ calculation of consistency functions.
"""
Index: specific_fns/consistency_tests.py
===================================================================
--- specific_fns/consistency_tests.py (revision 3370)
+++ specific_fns/consistency_tests.py (working copy)
@@ -447,7 +447,7 @@
value.append(self.default_value('tc'))
# Initilise data.
- if not hasattr(self.relax.data.res[self.run][index], 'csa') or
not hasattr(self.relax.data.res[self.run][index], 'csa') or not
hasattr(self.relax.data.res[self.run][index], 'orientation') or not
hasattr(self.relax.data.res[self.run][index], 'tc'):
+ if not hasattr(self.relax.data.res[self.run][index], 'csa') or
not hasattr(self.relax.data.res[self.run][index], 'r') or not
hasattr(self.relax.data.res[self.run][index], 'orientation') or not
hasattr(self.relax.data.res[self.run][index], 'tc'):
self.data_init(self.relax.data.res[self.run][index])
# CSA, bond length, angle Theta and correlation time.