r2659 - in /1.3/specific_fns: jw_mapping.py specific_setup.py -- October 22, 2006 - 11:52

Author: bugman
Date: Sun Oct 22 11:51:57 2006
New Revision: 2659

URL: http://svn.gna.org/viewcvs/relax?rev=2659&view=rev
Log:
Ported r2658 from the 1.2 line.

The command used was:
$ svn merge -r2657:2658 svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.2

These changes complete task #4002 (https://gna.org/task/index.php?4002), the 
implementation of the
'grace.write()' user function for reduced spectral density mapping.


Modified:
    1.3/specific_fns/jw_mapping.py
    1.3/specific_fns/specific_setup.py

Modified: 1.3/specific_fns/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/jw_mapping.py?rev=2659&r1=2658&r2=2659&view=diff
==============================================================================
--- 1.3/specific_fns/jw_mapping.py (original)
+++ 1.3/specific_fns/jw_mapping.py Sun Oct 22 11:51:57 2006
@@ -274,11 +274,11 @@
         | Data type              | Object name  | Patterns                   
                      |
         
|________________________|______________|__________________________________________________|
         |                        |              |                            
                      |
-        | J(0)                   | 'j0'         | '^[Jj]0$' or '[Jj](0)'     
                      |
+        | J(0)                   | 'j0'         | '^[Jj]0$' or '[Jj]\(0\)'   
                      |
         |                        |              |                            
                      |
-        | J(wX)                  | 'jwx'        | '^[Jj]w[Xx]$' or 
'[Jj](w[Xx])'                   |
+        | J(wX)                  | 'jwx'        | '^[Jj]w[Xx]$' or 
'[Jj]\(w[Xx]\)'                 |
         |                        |              |                            
                      |
-        | J(wH)                  | 'jwh'        | '^[Jj]w[Hh]$' or 
'[Jj](w[Hh])'                   |
+        | J(wH)                  | 'jwh'        | '^[Jj]w[Hh]$' or 
'[Jj]\(w[Hh]\)'                 |
         |                        |              |                            
                      |
         | Bond length            | 'r'          | '^r$' or '[Bb]ond[ 
-_][Ll]ength'                 |
         |                        |              |                            
                      |
@@ -288,15 +288,15 @@
         """
 
         # J(0).
-        if search('^[Jj]0$', name) or search('[Jj](0)', name):
+        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):
+        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):
+        if search('^[Jj]w[Hh]$', name) or search('[Jj]\(w[Hh]\)', name):
             return 'jwh'
 
         # Bond length.

Modified: 1.3/specific_fns/specific_setup.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/specific_fns/specific_setup.py?rev=2659&r1=2658&r2=2659&view=diff
==============================================================================
--- 1.3/specific_fns/specific_setup.py (original)
+++ 1.3/specific_fns/specific_setup.py Sun Oct 22 11:51:57 2006
@@ -162,13 +162,17 @@
         if self.eqi == 'return_data_name':
             return self.relax.specific.jw_mapping.return_data_name
 
+        # Factor of conversion between different parameter units returning 
function.
+        if self.eqi == 'return_conversion_factor':
+            return self.relax.specific.jw_mapping.return_conversion_factor
+
         # Data error returning function.
         if self.eqi == 'return_error':
             return self.relax.specific.jw_mapping.return_error
 
         # Grace string returning function.
         if self.eqi == 'return_grace_string':
-            return self.relax.specific.model_free.return_grace_string
+            return self.relax.specific.jw_mapping.return_grace_string
 
         # Simulation parameter array returning function.
         if self.eqi == 'return_sim_param':
@@ -180,7 +184,7 @@
 
         # String of the external parameter units returning function.
         if self.eqi == 'return_units':
-            return self.relax.specific.model_free.return_units
+            return self.relax.specific.jw_mapping.return_units
 
         # Value and error returning function.
         if self.eqi == 'return_value':