r19722 - in /branches/relax_disp: specific_analyses/relax_disp/ test_suite/shared_data/dispersion/Hansen/cpmgfit_results/ -- May 23, 2013 - 22:57

Author: bugman
Date: Thu May 23 22:57:26 2013
New Revision: 19722

URL: http://svn.gna.org/viewcvs/relax?rev=19722&view=rev
Log:
Fixes for the change to the new spectrometer.frequency user function and 
associated data structures.


Modified:
    branches/relax_disp/specific_analyses/relax_disp/__init__.py
    branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py
    
branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cpmgfit.py

Modified: branches/relax_disp/specific_analyses/relax_disp/__init__.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/__init__.py?rev=19722&r1=19721&r2=19722&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/__init__.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/__init__.py Thu May 23 
22:57:26 2013
@@ -729,7 +729,7 @@
         elif model == MODEL_LM63:
             print("The Luz and Meiboom (1963) 2-site fast exchange model.")
             params = []
-            for i in range(cdp.spectro_frq_count):
+            for i in range(cdp.spectrometer_frq_count):
                 params.append('r2')
             params += ['phi_ex', 'kex']
 
@@ -737,7 +737,7 @@
         elif model == MODEL_CR72:
             print("The Carver and Richards (1972) 2-site model for all time 
scales.")
             params = []
-            for i in range(cdp.spectro_frq_count):
+            for i in range(cdp.spectrometer_frq_count):
                 params.append('r2')
             params += ['r2a', 'ka', 'dw']
 

Modified: branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py?rev=19722&r1=19721&r2=19722&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp/cpmgfit.py Thu May 23 
22:57:26 2013
@@ -39,7 +39,7 @@
 from lib.io import mkdir_nofail, open_write_file, test_binary
 from lib.physical_constants import g1H
 from pipe_control import pipes
-from pipe_control.frq import get_values
+from pipe_control.spectrometer import get_frequencies
 from pipe_control.mol_res_spin import exists_mol_res_spin_data, spin_loop
 from specific_analyses.relax_disp.disp_data import loop_frq_point, 
return_param_key_from_data
 
@@ -190,7 +190,7 @@
     file.write("title %s\n" % spin_id)
 
     # The proton frequencies.
-    frq = get_values()
+    frq = get_frequencies()
 
     # Loop over each frequency.
     for i in range(len(frq)):
@@ -234,6 +234,7 @@
             continue
 
         # Tesla units.
+        print frq
         B0 = frq * 2.0 * pi / g1H
 
         # Write out the data and error.

Modified: 
branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cpmgfit.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cpmgfit.py?rev=19722&r1=19721&r2=19722&view=diff
==============================================================================
--- 
branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cpmgfit.py
 (original)
+++ 
branches/relax_disp/test_suite/shared_data/dispersion/Hansen/cpmgfit_results/cpmgfit.py
 Thu May 23 22:57:26 2013
@@ -78,7 +78,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)