Author: bugman
Date: Mon Nov 26 14:36:27 2007
New Revision: 4007
URL: http://svn.gna.org/viewcvs/relax?rev=4007&view=rev
Log:
Implemented the generic_fns.align_tensor.return_data_name() function.
Modified:
branches/N_state_model/generic_fns/align_tensor.py
Modified: branches/N_state_model/generic_fns/align_tensor.py
URL:
http://svn.gna.org/viewcvs/relax/branches/N_state_model/generic_fns/align_tensor.py?rev=4007&r1=4006&r2=4007&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/align_tensor.py (original)
+++ branches/N_state_model/generic_fns/align_tensor.py Mon Nov 26 14:36:27
2007
@@ -625,7 +625,7 @@
def return_data_name(name):
"""
- Diffusion tensor parameter string matching patterns
+ Alignment tensor parameter string matching patterns
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
____________________________________________________________________________________________
@@ -633,88 +633,55 @@
| Data type | Object name
| Patterns |
|________________________________________________________|______________|__________________|
| |
| |
- | Global correlation time - tm | 'tm'
| '^tm$' |
+ | The xx component of the alignment tensor - Axx | 'Axx'
| '[Aa]xx' |
| |
| |
- | Isotropic component of the alignment tensor - Diso | 'Diso'
| '[Dd]iso' |
+ | The yy component of the alignment tensor - Ayy | 'Ayy'
| '[Aa]yy' |
| |
| |
- | Anisotropic component of the alignment tensor - Da | 'Da'
| '[Dd]a' |
+ | The zz component of the alignment tensor - Azz | 'Azz'
| '[Aa]zz' |
| |
| |
- | Rhombic component of the alignment tensor - Dr | 'Dr'
| '[Dd]r$' |
+ | The xy component of the alignment tensor - Axy | 'Axy'
| '[Aa]xy' |
| |
| |
- | Eigenvalue associated with the x-axis of the alignment | 'Dx'
| '[Dd]x' |
- | alignment tensor - Dx |
| |
+ | The xz component of the alignment tensor - Axz | 'Axz'
| '[Aa]xz' |
| |
| |
- | Eigenvalue associated with the y-axis of the alignment | 'Dy'
| '[Dd]y' |
- | alignment tensor - Dy |
| |
+ | The yz component of the alignment tensor - Ayz | 'Ayz'
| '[Aa]yz' |
| |
| |
- | Eigenvalue associated with the z-axis of the alignment | 'Dz'
| '[Dd]z' |
- | alignment tensor - Dz |
| |
+ | The xx-yy component of the alignment tensor - Axx-yy | 'Axxyy'
| '[Aa]xxyy' |
| |
| |
- | Diffusion coefficient parallel to the major axis of | 'Dpar'
| '[Dd]par' |
- | the spheroid alignment tensor - Dpar |
| |
+ | The first Euler angle of the alignment tensor - alpha | 'alpha'
| '^a$' or 'alpha' |
| |
| |
- | Diffusion coefficient perpendicular to the major axis | 'Dper'
| '[Dd]per' |
- | of the spheroid alignment tensor - Dper |
| |
+ | The second Euler angle of the alignment tensor - beta | 'beta'
| '^b$' or 'beta' |
| |
| |
- | Ratio of the parallel and perpendicular components of | 'Dratio'
| '[Dd]ratio' |
- | the spheroid alignment tensor - Dratio |
| |
- | |
| |
- | The first Euler angle of the ellipsoid alignment | 'alpha'
| '^a$' or 'alpha' |
- | tensor - alpha |
| |
- | |
| |
- | The second Euler angle of the ellipsoid alignment | 'beta'
| '^b$' or 'beta' |
- | tensor - beta |
| |
- | |
| |
- | The third Euler angle of the ellipsoid alignment | 'gamma'
| '^g$' or 'gamma' |
- | tensor - gamma |
| |
- | |
| |
- | The polar angle defining the major axis of the | 'theta'
| 'theta' |
- | spheroid alignment tensor - theta |
| |
- | |
| |
- | The azimuthal angle defining the major axis of the | 'phi'
| 'phi' |
- | spheroid alignment tensor - phi |
| |
+ | The third Euler angle of the alignment tensor - gamma | 'gamma'
| '^g$' or 'gamma' |
|________________________________________________________|______________|__________________|
"""
- # Local tm.
- if search('^tm$', name):
- return 'tm'
-
- # Diso.
- if search('[Dd]iso', name):
- return 'Diso'
-
- # Da.
- if search('[Dd]a', name):
- return 'Da'
-
- # Dr.
- if search('[Dd]r$', name):
- return 'Dr'
-
- # Dx.
- if search('[Dd]x', name):
- return 'Dx'
-
- # Dy.
- if search('[Dd]y', name):
- return 'Dy'
-
- # Dz.
- if search('[Dd]z', name):
- return 'Dz'
-
- # Dpar.
- if search('[Dd]par', name):
- return 'Dpar'
-
- # Dper.
- if search('[Dd]per', name):
- return 'Dper'
-
- # Dratio.
- if search('[Dd]ratio', name):
- return 'Dratio'
+ # Axx.
+ if search('[Aa]xx', name):
+ return 'Axx'
+
+ # Ayy.
+ if search('[Aa]yy', name):
+ return 'Ayy'
+
+ # Azz.
+ if search('[Aa]zz', name):
+ return 'Azz'
+
+ # Axy.
+ if search('[Aa]xy', name):
+ return 'Axy'
+
+ # Axz.
+ if search('[Aa]xz', name):
+ return 'Axz'
+
+ # Ayz.
+ if search('[Aa]yz', name):
+ return 'Ayz'
+
+ # Axx-yy.
+ if search('[Aa]xxyy', name):
+ return 'Axxyy'
# alpha.
if search('^a$', name) or search('alpha', name):
@@ -727,14 +694,6 @@
# gamma.
if search('^g$', name) or search('gamma', name):
return 'gamma'
-
- # theta.
- if search('theta', name):
- return 'theta'
-
- # phi.
- if search('phi', name):
- return 'phi'
def return_eigenvalues(run=None):
r4007 - /branches/N_state_model/generic_fns/align_tensor.py