r19204 - in /branches/relax_disp: specific_analyses/relax_disp.py test_suite/system_tests/scripts/relax_disp_cpmg_fast.py -- March 27, 2013 - 14:19

Author: bugman
Date: Wed Mar 27 14:19:40 2013
New Revision: 19204

URL: http://svn.gna.org/viewcvs/relax?rev=19204&view=rev
Log:
Ported r8364 from the old relax_disp branch into the new branch.

The commands used were:
svn merge -r8363:8364 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses
svn merge -r8363:8364 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/test_suite/@r18123 
test_suite

.....
  r8364 | semor | 2009-01-10 21:57:57 +0100 (Sat, 10 Jan 2009) | 3 lines
  Changed paths:
     M /branches/relax_disp/specific_fns/relax_disp.py
     M 
/branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py
  
  Changed the format of the CPMG frequency and corrected the names of some 
input files.
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py
    
branches/relax_disp/test_suite/system_tests/scripts/relax_disp_cpmg_fast.py

Modified: branches/relax_disp/specific_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/specific_analyses/relax_disp.py?rev=19204&r1=19203&r2=19204&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:19:40 
2013
@@ -201,7 +201,7 @@
         """Set the CPMG frequency associated with a given spectrum.
 
         @keyword cpmg_frq:      The frequency, in Hz, of the CPMG pulse 
train.
-        @type cpmg_frq:         int
+        @type cpmg_frq:         float
         @keyword spectrum_id:   The spectrum identification string.
         @type spectrum_id:      str
         """
@@ -214,7 +214,8 @@
             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(cpmg_frq)
+        if cpmg_frq != None:
+            self.__cpmg_frq = float(cpmg_frq)
 
         # The index.
         index = cdp.spectrum_ids.index(spectrum_id)

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=19204&r1=19203&r2=19204&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 
Wed Mar 27 14:19:40 2013
@@ -82,9 +82,9 @@
     relax_disp.cpmg_frq(cpmg_frq=cpmg_frq[i], spectrum_id=names[i])
 
 # Specify the duplicated spectra.
-spectrum.replicated(spectrum_ids=['133.33.in', '133.33.in.bis'])
-spectrum.replicated(spectrum_ids=['533.33.in', '533.33.in.bis'])
-spectrum.replicated(spectrum_ids=['933.33.in', '933.33.in.bis'])
+spectrum.replicated(spectrum_ids=['133.33.in_sparky', 
'133.33.in.bis_sparky'])
+spectrum.replicated(spectrum_ids=['533.33.in_sparky', 
'533.33.in.bis_sparky'])
+spectrum.replicated(spectrum_ids=['933.33.in_sparky', 
'933.33.in.bis_sparky'])
 
 # Peak intensity error analysis.
 spectrum.error_analysis()