r11650 - /branches/bmrb/generic_fns/relax_data.py -- October 22, 2010 - 11:33

Author: bugman
Date: Fri Oct 22 11:33:46 2010
New Revision: 11650

URL: http://svn.gna.org/viewcvs/relax?rev=11650&view=rev
Log:
The spectrometer frequency is now converted to MHz before being sent to 
BMRBlib.


Modified:
    branches/bmrb/generic_fns/relax_data.py

Modified: branches/bmrb/generic_fns/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/relax_data.py?rev=11650&r1=11649&r2=11650&view=diff
==============================================================================
--- branches/bmrb/generic_fns/relax_data.py (original)
+++ branches/bmrb/generic_fns/relax_data.py Fri Oct 22 11:33:46 2010
@@ -354,6 +354,9 @@
         ri_label = cdp.ri_labels[i]
         frq_label = cdp.frq_labels[cdp.remap_table[i]]
 
+        # Convert to MHz.
+        frq = cdp.frq[cdp.remap_table[i]] * 1e-6
+
         # Get the temperature control methods.
         temp_calib = cdp.exp_info.get_temp_calibration(ri_label, frq_label)
         temp_control = cdp.exp_info.get_temp_control(ri_label, frq_label)
@@ -368,7 +371,7 @@
             raise RelaxError("The temperature control method for the '%s' 
ri_label and '%s' frq_label have not been specified." % (ri_label, frq_label))
 
         # Add the relaxation data.
-        star.relaxation.add(data_type=ri_label, 
frq=cdp.frq[cdp.remap_table[i]], entity_ids=entity_ids, 
res_nums=res_num_list, res_names=res_name_list, atom_names=atom_name_list, 
atom_types=element_list, isotope=isotope_list, entity_ids_2=entity_ids, 
res_nums_2=res_num_list, res_names_2=res_name_list, 
atom_names_2=attached_atom_name_list, atom_types_2=attached_element_list, 
isotope_2=attached_isotope_list, data=relax_data_list[i], 
errors=relax_error_list[i], temp_calibration=temp_calib, 
temp_control=temp_control, peak_intensity_type=peak_intensity_type)
+        star.relaxation.add(data_type=ri_label, frq=frq, 
entity_ids=entity_ids, res_nums=res_num_list, res_names=res_name_list, 
atom_names=atom_name_list, atom_types=element_list, isotope=isotope_list, 
entity_ids_2=entity_ids, res_nums_2=res_num_list, res_names_2=res_name_list, 
atom_names_2=attached_atom_name_list, atom_types_2=attached_element_list, 
isotope_2=attached_isotope_list, data=relax_data_list[i], 
errors=relax_error_list[i], temp_calibration=temp_calib, 
temp_control=temp_control, peak_intensity_type=peak_intensity_type)
 
 
 def copy(pipe_from=None, pipe_to=None, ri_label=None, frq_label=None):