Author: bugman
Date: Tue Dec 11 17:39:38 2007
New Revision: 4189
URL: http://svn.gna.org/viewcvs/relax?rev=4189&view=rev
Log:
Updated the return_data_name() function to handle the Sij and Pij elements.
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=4189&r1=4188&r2=4189&view=diff
==============================================================================
--- branches/N_state_model/generic_fns/align_tensor.py (original)
+++ branches/N_state_model/generic_fns/align_tensor.py Tue Dec 11 17:39:38
2007
@@ -636,6 +636,20 @@
| Data type | Object name
| Patterns |
|________________________________________________________|______________|__________________|
| |
| |
+ | The xx component of the Saupe order matrix - Sxx | 'Sxx'
| '^[Sa]xx$' |
+ | |
| |
+ | The yy component of the Saupe order matrix - Syy | 'Syy'
| '^[Sa]yy$' |
+ | |
| |
+ | The zz component of the Saupe order matrix - Szz | 'Szz'
| '^[Sa]zz$' |
+ | |
| |
+ | The xy component of the Saupe order matrix - Sxy | 'Sxy'
| '^[Sa]xy$' |
+ | |
| |
+ | The xz component of the Saupe order matrix - Sxz | 'Sxz'
| '^[Sa]xz$' |
+ | |
| |
+ | The yz component of the Saupe order matrix - Syz | 'Syz'
| '^[Sa]yz$' |
+ | |
| |
+ | The xx-yy component of the Saupe order matrix - Sxx-yy | 'Sxxyy'
| '^[Sa]xxyy$' |
+ | |
| |
| The xx component of the alignment tensor - Axx | 'Axx'
| '^[Aa]xx$' |
| |
| |
| The yy component of the alignment tensor - Ayy | 'Ayy'
| '^[Aa]yy$' |
@@ -649,6 +663,20 @@
| The yz component of the alignment tensor - Ayz | 'Ayz'
| '^[Aa]yz$' |
| |
| |
| The xx-yy component of the alignment tensor - Axx-yy | 'Axxyy'
| '^[Aa]xxyy$' |
+ | |
| |
+ | The xx component of the probability matrix - Pxx | 'Pxx'
| '^[Pa]xx$' |
+ | |
| |
+ | The yy component of the probability matrix - Pyy | 'Pyy'
| '^[Pa]yy$' |
+ | |
| |
+ | The zz component of the probability matrix - Pzz | 'Pzz'
| '^[Pa]zz$' |
+ | |
| |
+ | The xy component of the probability matrix - Pxy | 'Pxy'
| '^[Pa]xy$' |
+ | |
| |
+ | The xz component of the probability matrix - Pxz | 'Pxz'
| '^[Pa]xz$' |
+ | |
| |
+ | The yz component of the probability matrix - Pyz | 'Pyz'
| '^[Pa]yz$' |
+ | |
| |
+ | The xx-yy component of the probability matrix - Pxx-yy | 'Pxxyy'
| '^[Pa]xxyy$' |
| |
| |
| The first Euler angle of the alignment tensor - alpha | 'alpha'
| '^a$' or 'alpha' |
| |
| |
@@ -662,6 +690,34 @@
if type(name) != str:
raise RelaxStrError, ('name', name)
+ # Sxx.
+ if search('^[Sa]xx$', name):
+ return 'Sxx'
+
+ # Syy.
+ if search('^[Sa]yy$', name):
+ return 'Syy'
+
+ # Szz.
+ if search('^[Sa]zz$', name):
+ return 'Szz'
+
+ # Sxy.
+ if search('^[Sa]xy$', name):
+ return 'Sxy'
+
+ # Sxz.
+ if search('^[Sa]xz$', name):
+ return 'Sxz'
+
+ # Syz.
+ if search('^[Sa]yz$', name):
+ return 'Syz'
+
+ # Sxx-yy.
+ if search('^[Sa]xxyy$', name):
+ return 'Sxxyy'
+
# Axx.
if search('^[Aa]xx$', name):
return 'Axx'
@@ -689,6 +745,34 @@
# Axx-yy.
if search('^[Aa]xxyy$', name):
return 'Axxyy'
+
+ # Pxx.
+ if search('^[Pa]xx$', name):
+ return 'Pxx'
+
+ # Pyy.
+ if search('^[Pa]yy$', name):
+ return 'Pyy'
+
+ # Pzz.
+ if search('^[Pa]zz$', name):
+ return 'Pzz'
+
+ # Pxy.
+ if search('^[Pa]xy$', name):
+ return 'Pxy'
+
+ # Pxz.
+ if search('^[Pa]xz$', name):
+ return 'Pxz'
+
+ # Pyz.
+ if search('^[Pa]yz$', name):
+ return 'Pyz'
+
+ # Pxx-yy.
+ if search('^[Pa]xxyy$', name):
+ return 'Pxxyy'
# alpha.
if search('^a$', name) or search('alpha', name):
r4189 - /branches/N_state_model/generic_fns/align_tensor.py