r19743 - in /branches/relax_disp: specific_analyses/relax_disp/ test_suite/system_tests/scripts/relax_disp/ -- May 27, 2013 - 13:38

Author: bugman
Date: Mon May 27 13:38:16 2013
New Revision: 19743

URL: http://svn.gna.org/viewcvs/relax?rev=19743&view=rev
Log:
Fixes for the relax_disp branch for the spectrometer.frequency user function 
changes.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/parameters.py
    
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py

Modified: branches/relax_disp/specific_analyses/relax_disp/parameters.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/parameters.py?rev=19743&r1=19742&r2=19743&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/parameters.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/parameters.py Mon May 27 
13:38:16 2013
@@ -330,11 +330,11 @@
             if 'r2' in spin.params:
                 if sim_index != None:
                     spin.r2_sim[sim_index] = []
-                    for i in range(cdp.spectro_frq_count):
+                    for i in range(cdp.spectrometer_frq_count):
                         spin.r2_sim[sim_index].append(None)
                 else:
                     spin.r2 = []
-                    for i in range(cdp.spectro_frq_count):
+                    for i in range(cdp.spectrometer_frq_count):
                         spin.r2.append(None)
 
             # Loop over each parameter.

Modified: 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py?rev=19743&r1=19742&r2=19743&view=diff
==============================================================================
--- 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py 
(original)
+++ 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp/hansen_data.py 
Mon May 27 13:38:16 2013
@@ -100,7 +100,7 @@
     relax_disp.cpmg_frq(spectrum_id=id, cpmg_frq=cpmg_frq)
 
     # Set the NMR field strength of the spectrum.
-    frq.set(id=id, frq=H_frq)
+    spectrometer.frequency(id=id, frq=H_frq)
 
     # Relaxation dispersion CPMG constant time delay T (in s).
     relax_disp.relax_time(spectrum_id=id, time=0.030)