r16143 - in /branches/uf_redesign/user_functions: consistency_tests.py jw_mapping.py -- May 09, 2012 - 10:56

Author: bugman
Date: Wed May  9 10:56:31 2012
New Revision: 16143

URL: http://svn.gna.org/viewcvs/relax?rev=16143&view=rev
Log:
The consistency_tests.set_frq and jw_mapping.set_frq have been synchronised.

These perform exactly the same purpose, and have been made almost identical.


Modified:
    branches/uf_redesign/user_functions/consistency_tests.py
    branches/uf_redesign/user_functions/jw_mapping.py

Modified: branches/uf_redesign/user_functions/consistency_tests.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/consistency_tests.py?rev=16143&r1=16142&r2=16143&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/consistency_tests.py (original)
+++ branches/uf_redesign/user_functions/consistency_tests.py Wed May  9 
10:56:31 2012
@@ -25,8 +25,9 @@
 """Module containing the 'consistency_tests' user function data."""
 
 # relax module imports.
+from generic_fns import frq
+from graphics import ANALYSIS_IMAGE_PATH
 from specific_fns.setup import consistency_tests_obj
-from graphics import ANALYSIS_IMAGE_PATH
 from user_functions.data import Uf_info; uf_info = Uf_info()
 
 
@@ -45,10 +46,13 @@
     name = "frq",
     py_type = "float",
     desc_short = "spectrometer frequency in Hz",
-    desc = "The spectrometer frequency in Hz.  This must match the currently 
loaded data to the last decimal point."
+    desc = "The spectrometer frequency in Hz.  This must match the currently 
loaded data to the last decimal point.  See the 'sfrq' parameter in the 
Varian procpar file or the 'SFO1' parameter in the Bruker acqus file.",
+    wiz_element_type = 'combo',
+    wiz_combo_iter = frq.get_values,
+    wiz_read_only = True,
 )
 uf.desc = """
-This will select the relaxation data to use in the consistency tests 
corresponding to the given frequencies.
+This will select the relaxation data to use in the consistency tests 
corresponding to the given frequencies.  The data is selected by the 
spectrometer frequency in Hertz, which should be set to the exact value (see 
the 'sfrq' parameter in the Varian procpar file or the 'SFO1' parameter in 
the Bruker acqus file).  Note thought that the R1, R2 and NOE are all 
expected to have the exact same frequency in the J(w) mapping analysis (to 
the last decimal point).
 """
 uf.prompt_examples = """
 relax> consistency_tests.set_frq(600.0 * 1e6)
@@ -56,5 +60,6 @@
 """
 uf.backend = consistency_tests_obj._set_frq
 uf.menu_text = "&set_frq"
-uf.wizard_size = (700, 400)
+uf.wizard_height_desc = 350
+uf.wizard_size = (700, 500)
 uf.wizard_image = ANALYSIS_IMAGE_PATH + 'consistency_testing_200x94.png'

Modified: branches/uf_redesign/user_functions/jw_mapping.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/uf_redesign/user_functions/jw_mapping.py?rev=16143&r1=16142&r2=16143&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/jw_mapping.py (original)
+++ branches/uf_redesign/user_functions/jw_mapping.py Wed May  9 10:56:31 2012
@@ -25,7 +25,7 @@
 
 # relax module imports.
 from generic_fns import frq
-from graphics import WIZARD_IMAGE_PATH
+from graphics import ANALYSIS_IMAGE_PATH
 from specific_fns.setup import jw_mapping_obj
 from user_functions.data import Uf_info; uf_info = Uf_info()