r16140 - /branches/uf_redesign/user_functions/jw_mapping.py -- May 09, 2012 - 10:50

Author: bugman
Date: Wed May  9 10:50:38 2012
New Revision: 16140

URL: http://svn.gna.org/viewcvs/relax?rev=16140&view=rev
Log:
Refinement of the jw_mapping.set_frq user function.

The wizard page now shows a read only ComboBox of the allowed spectrometer 
frequencies, so that the
user does not need to input the exact value.  The descriptions have also been 
improved.


Modified:
    branches/uf_redesign/user_functions/jw_mapping.py

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=16140&r1=16139&r2=16140&view=diff
==============================================================================
--- branches/uf_redesign/user_functions/jw_mapping.py (original)
+++ branches/uf_redesign/user_functions/jw_mapping.py Wed May  9 10:50:38 2012
@@ -24,8 +24,9 @@
 """Module containing the Reduced Spectral Density Mapping 'jw_mapping' user 
function data."""
 
 # relax module imports.
+from generic_fns import frq
+from graphics import WIZARD_IMAGE_PATH
 from specific_fns.setup import jw_mapping_obj
-from graphics import WIZARD_IMAGE_PATH
 from user_functions.data import Uf_info; uf_info = Uf_info()
 
 
@@ -43,10 +44,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 function will select the relaxation data to use in the reduced spectral 
density mapping corresponding to the given frequency.
+This will select the relaxation data to use in the reduced spectral density 
mapping corresponding to the given frequency.  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> jw_mapping.set_frq(600.0 * 1e6)
@@ -54,4 +58,5 @@
 """
 uf.backend = jw_mapping_obj._set_frq
 uf.menu_text = "&set_frq"
-uf.wizard_size = (700, 400)
+uf.wizard_height_desc = 350
+uf.wizard_size = (800, 600)