|
Hi Ed, Hera are patches for the consistency tests code. Even if the changes are relatively small and won;t normally affect the execution of the code, these are intended to be commited before the merging of the consistency tests branch into the main 1.2 branch. The patches I submitted recently (https://mail.gna.org/public/relax-devel/2007-10/msg00006.html) are now replaced by modified patches made on revision 3375 of line 1.2. Here are the commit messages for the attached patches. =================================================== Application of a patch by Sebastien Morin (sebastien dot morin dot 1 at ulaval dot ca) that changes the default CSA value so it's consistent with the rest of relax. The patch 'patch_1.2-r3375_consistency_branch__CSA' changes the default CSA value from -170 to -172 ppm in the file 'specific_fns/consistency_tests.py'. This change follows the one at : http://svn.gna.org/viewcvs/relax/1.2/specific_fns/jw_mapping.py?rev=3354&r1=3353&r2=3354&view=diff for jw_mapping from which the code for consistency tests originated. =================================================== =================================================== Application of a patch by Sebastien Morin (sebastien dot morin dot 1 at ulaval dot ca) that complements information given to users on consistency testing. The patch 'patch_1.2-r3375_consistency_branch__docstring' adds some text in docstrings or comments of files 'maths_fns/consistency_tests.py' and 'specific_fns/consistency_tests.py' to help users understand why and how use the consistency tests. =================================================== =================================================== Application of a patch by Sebastien Morin (sebastien dot morin dot 1 at ulaval dot ca) that corrects a typo. The patch 'patch_1.2-r3375_consistency_branch__typo' corrects a typo in function 'set()' of file 'specific_fns/consistency_tests.py' where 'csa' was written twice instead of first 'csa' and then 'r'. This change follows the one at : http://svn.gna.org/viewcvs/relax/1.2/specific_fns/jw_mapping.py?rev=3348&r1=3343&r2=3348 for jw_mapping from which the code for consistency tests originated. This was first reported for the jw_mapping code (bug #9562). =================================================== Let me know if something misses... Regards Séb :) Edward d'Auvergne wrote: Hi, Prior to me committing these patches, would you be able to write the full commit message for these so I can just cut and paste them? For example links to posts or previous commits for the CSA value change would be useful for people in the future to back track the origin. And maybe the third patch pointing to the bug report where this was fixed in the code the consistency test code originated from. The fuller the description, the easier it is for me to generate summaries of changes in the main lines, i.e. in the CHANGES file. Ideally the first line should be the description that goes into this CHANGES file, assuming the individual change is worthy to be noted there. Thanks, Edward On 10/22/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 3375)
+++ 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 3375)
+++ 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 histograms, 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 3375)
+++ 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 3375)
+++ 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.