r8345 - in /branches/relax_disp: prompt/ specific_fns/ test_suite/system_tests/scripts/ -- January 08, 2009 - 20:31

Author: semor
Date: Thu Jan  8 20:30:41 2009
New Revision: 8345

URL: http://svn.gna.org/viewcvs/relax?rev=8345&view=rev
Log:
Corrected remaining frq instances to cpmg_frq when appropriate to avoid 
confusion and corrected a
few related things in the system test script.


Modified:
    branches/relax_disp/prompt/relax_disp.py
    branches/relax_disp/specific_fns/relax_disp.py
    
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py

Modified: branches/relax_disp/prompt/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/prompt/relax_disp.py?rev=8345&r1=8344&r2=8345&view=diff
==============================================================================
--- branches/relax_disp/prompt/relax_disp.py (original)
+++ branches/relax_disp/prompt/relax_disp.py Thu Jan  8 20:30:41 2009
@@ -92,13 +92,13 @@
         relax_disp_obj.cpmg_delayT(id=id, delayT=delayT)
 
 
-    def cpmg_frq(self, frq=0, spectrum_id=None):
+    def cpmg_frq(self, cpmg_frq=0, spectrum_id=None):
         """Set the CPMG frequency associated with a given spectrum.
 
         Keyword arguments.
         ~~~~~~~~~~~~~~~~~~
 
-        frq:   The frequency, in Hz, of the CPMG pulse train.
+        cpmg_frq:   The frequency, in Hz, of the CPMG pulse train.
 
         spectrum_id:   The spectrum identification string.
 
@@ -117,31 +117,31 @@
         To identify the reference spectrum called 'reference_spectrum', type:
 
         relax> relax_disp.cpmg_frq(0, 'reference_spectrum')
-        relax> relax_disp.cpmg_frq(frq=0, spectrum_id='reference_spectrum')
+        relax> relax_disp.cpmg_frq(cpmg_frq=0, 
spectrum_id='reference_spectrum')
 
         To set a frequency of 200 Hz for the spectrum '200_Hz_spectrum', 
type:
 
         relax> relax_disp.cpmg_frq(200, '200_Hz_spectrum')
-        relax> relax_disp.cpmg_frq(frq=200, spectrum_id='200_Hz_spectrum')
-        """
-
-        # Function intro text.
-        if self.__relax__.interpreter.intro:
-            text = sys.ps3 + "frq("
+        relax> relax_disp.cpmg_frq(fcpmg_rq=200, 
spectrum_id='200_Hz_spectrum')
+        """
+
+        # Function intro text.
+        if self.__relax__.interpreter.intro:
+            text = sys.ps3 + "cpmg_frq("
             text = text + "spectrum_id=" + `spectrum_id`
-            text = text + ", frq=" + `frq` + ")"
-            print text
-
-        # The frq argument.
-        if type(frq) != int:
-            raise RelaxIntError, ('frq', frq)
+            text = text + ", cpmg_frq=" + `cpmg_frq` + ")"
+            print text
+
+        # The cpmg_frq argument.
+        if type(cpmg_frq) != int:
+            raise RelaxIntError, ('cpmg_frq', cpmg_frq)
 
         # The spectrum_id argument.
         if type(spectrum_id) != str:
              raise RelaxStrError, ('spectrum_id', spectrum_id)
 
         # Execute the functional code.
-        relax_disp_obj.cpmg_frq(frq=frq, spectrum_id=spectrum_id)
+        relax_disp_obj.cpmg_frq(cpmg_frq=cpmg_frq, spectrum_id=spectrum_id)
 
 
     def exp_type(self, exp='cpmg'):

Modified: branches/relax_disp/specific_fns/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_fns/relax_disp.py?rev=8345&r1=8344&r2=8345&view=diff
==============================================================================
--- branches/relax_disp/specific_fns/relax_disp.py (original)
+++ branches/relax_disp/specific_fns/relax_disp.py Thu Jan  8 20:30:41 2009
@@ -170,11 +170,11 @@
         return results[result_index]
 
 
-    def cpmg_frq(self, frq=0, spectrum_id=None):
+    def cpmg_frq(self, cpmg_frq=0, spectrum_id=None):
         """Set the CPMG frequency associated with a given spectrum.
 
-        @keyword frq:           The frequency, in Hz, of the CPMG pulse 
train.
-        @type frq:              int
+        @keyword cpmg_frq:      The frequency, in Hz, of the CPMG pulse 
train.
+        @type cpmg_frq:         int
         @keyword spectrum_id:   The spectrum identification string.
         @type spectrum_id:      str
         """
@@ -187,7 +187,7 @@
             raise RelaxError, "The peak heights corresponding to spectrum id 
'%s' have not been loaded." % spectrum_id
 
         # Store the CPMG frequency in the class instance.
-        self.__cpmg_frq = int(frq)
+        self.__cpmg_frq = int(cpmg_frq)
 
         # The index.
         index = cdp.spectrum_ids.index(spectrum_id)
@@ -204,7 +204,7 @@
                 break
 
         # Add the frequency at the correct position.
-        cdp.cpmg_frqs[index] = frq
+        cdp.cpmg_frqs[index] = cpmg_frq
 
 
     def cpmg_delayT(self, id=None, delayT=None):

Modified: 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py?rev=8345&r1=8344&r2=8345&view=diff
==============================================================================
--- 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py 
(original)
+++ 
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py 
Thu Jan  8 20:30:41 2009
@@ -27,7 +27,7 @@
 relax_disp.cpmg_delayT(id='600', delayT=0.020)
 
 # Relaxation dispersion CPMG frequencies (in Hz).
-relax_disp.cpmg_frq = [
+cpmg_frq = [
     0.1936
 ]
 
@@ -43,7 +43,7 @@
     spectrum.read_intensities(file=names[i]+'.list', dir=data_path, 
spectrum_id=names[i], int_method='height')
 
     # Set the relaxation dispersion CPMG frequencies.
-    relax_disp.relax_time(frq=frq[i], spectrum_id=names[i])
+    relax_disp.cpmg_frq(cpmg_frq=cpmg_frq[i], spectrum_id=names[i])
 
 # Specify the duplicated spectra.
 #spectrum.replicated(spectrum_ids=['T2_ncyc1_ave', 'T2_ncyc1b_ave'])