r4581 - /branches/consistency_tests_1.3/specific_fns/consistency_tests.py -- January 09, 2008 - 20:13

Author: semor
Date: Wed Jan  9 20:12:48 2008
New Revision: 4581

URL: http://svn.gna.org/viewcvs/relax?rev=4581&view=rev
Log:
Adapted, for consistency testing, some remnants of the jw_mapping code.


Modified:
    branches/consistency_tests_1.3/specific_fns/consistency_tests.py

Modified: branches/consistency_tests_1.3/specific_fns/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/consistency_tests_1.3/specific_fns/consistency_tests.py?rev=4581&r1=4580&r2=4581&view=diff
==============================================================================
--- branches/consistency_tests_1.3/specific_fns/consistency_tests.py 
(original)
+++ branches/consistency_tests_1.3/specific_fns/consistency_tests.py Wed Jan  
9 20:12:48 2008
@@ -340,13 +340,13 @@
         if search('^[Jj]0$', name) or search('[Jj]\(0\)', name):
             return 'j0'
 
-        # J(wX).
-        if search('^[Jj]w[Xx]$', name) or search('[Jj]\(w[Xx]\)', name):
-            return 'jwx'
-
-        # J(wH).
-        if search('^[Jj]w[Hh]$', name) or search('[Jj]\(w[Hh]\)', name):
-            return 'jwh'
+        # F_eta.
+        if search('^[Ff]_[Ee][Tt][Aa]$', name):
+            return 'f_eta'
+
+        # F_R2.
+        if search('^^[Ff]_[Rr]2$', name):
+            return 'f_r2'
 
         # Bond length.
         if search('^r$', name) or search('[Bb]ond[ -_][Ll]ength', name):
@@ -380,12 +380,12 @@
             return '\\qJ(0)\\Q'
 
         # J(wX).
-        elif object_name == 'jwx':
-            return '\\qJ(\\xw\\f{}\\sX\\N)\\Q'
+        elif object_name == 'f_eta':
+            return '\\qF\\s\\xh\\Q'
 
         # J(wH).
-        elif object_name == 'jwh':
-            return '\\qJ(\\xw\\f{}\\sH\\N)\\Q'
+        elif object_name == 'f_r2':
+            return '\\qF\\sR2\\Q'
 
         # Bond length.
         elif object_name == 'r':