r19479 - /branches/relax_disp/specific_analyses/relax_disp.py -- April 15, 2013 - 18:24

Author: bugman
Date: Mon Apr 15 18:24:24 2013
New Revision: 19479

URL: http://svn.gna.org/viewcvs/relax?rev=19479&view=rev
Log:
The relax_disp.cpmg_delayT user function backend now uses the spectrum ID 
rather than experiment ID.


Modified:
    branches/relax_disp/specific_analyses/relax_disp.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=19479&r1=19478&r2=19479&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Mon Apr 15 18:24:24 
2013
@@ -345,13 +345,13 @@
         return ids
 
 
-    def _cpmg_delayT(self, id=None, delayT=None):
+    def _cpmg_delayT(self, spectrum_id=None, delayT=None):
         """Set the CPMG constant time delay (T) of the experiment.
 
-        @keyword id:       The experimental identification string (allowing 
for multiple experiments per data pipe).
-        @type id:          str
-        @keyword delayT:   The CPMG constant time delay (T) in s.
-        @type delayT:      float
+        @keyword spectrum_id:   The spectrum ID string.
+        @type spectrum_id:      str
+        @keyword delayT:        The CPMG constant time delay (T) in s.
+        @type delayT:           float
         """
 
         # Test if the current data pipe exists.
@@ -375,12 +375,12 @@
             raise RelaxError("To use this user function, the experiment type 
must be set to 'cpmg'.")
 
         # Test the CPMG constant time delay (T) has not already been set.
-        if cdp.delayT.has_key(id):
-           raise RelaxError("The CPMG constant time delay (T) for the 
experiment '%s' has already been set." % id)
+        if cdp.delayT.has_key(spectrum_id):
+           raise RelaxError("The CPMG constant time delay (T) for the 
spectrum '%s' has already been set." % spectrum_id)
 
         # Set the CPMG constant time delay (T).
-        cdp.delayT[id] = delayT
-        print("The CPMG delay T for experiment '%s' has been set to %s s." % 
(id, cdp.delayT[id]))
+        cdp.delayT[spectrum_id] = delayT
+        print("The CPMG delay T for the spectrum '%s' has been set to %s s." 
% (spectrum_id, cdp.delayT[spectrum_id]))
 
 
     def _cpmg_frq(self, spectrum_id=None, cpmg_frq=None):