r6340 - /branches/relax_data_rearrange/prompt/relax_data.py -- June 08, 2008 - 14:17

Author: bugman
Date: Sun Jun  8 14:02:37 2008
New Revision: 6340

URL: http://svn.gna.org/viewcvs/relax?rev=6340&view=rev
Log:
Updated the relax_data.back_calc() user function to the new design.


Modified:
    branches/relax_data_rearrange/prompt/relax_data.py

Modified: branches/relax_data_rearrange/prompt/relax_data.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_data_rearrange/prompt/relax_data.py?rev=6340&r1=6339&r2=6340&view=diff
==============================================================================
--- branches/relax_data_rearrange/prompt/relax_data.py (original)
+++ branches/relax_data_rearrange/prompt/relax_data.py Sun Jun  8 14:02:37 
2008
@@ -42,14 +42,12 @@
         self.__relax__ = relax
 
 
-    def back_calc(self, run=None, ri_label=None, frq_label=None, frq=None):
+    def back_calc(self, ri_label=None, frq_label=None, frq=None):
         """Function for back calculating relaxation data.
 
         Keyword Arguments
         ~~~~~~~~~~~~~~~~~
 
-        run:  The name of the run.
-
         ri_label:  The relaxation data type, ie 'R1', 'R2', or 'NOE'.
 
         frq_label:  The field strength label.
@@ -61,15 +59,10 @@
         # Function intro text.
         if self.__relax__.interpreter.intro:
             text = sys.ps3 + "relax_data.back_calc("
-            text = text + "run=" + `run`
-            text = text + ", ri_label=" + `ri_label`
+            text = text + "ri_label=" + `ri_label`
             text = text + ", frq_label=" + `frq_label`
             text = text + ", frq=" + `frq` + ")"
             print text
-
-        # The run name.
-        if type(run) != str:
-            raise RelaxStrError, ('run', run)
 
         # Relaxation data type.
         if type(ri_label) != str:
@@ -84,7 +77,7 @@
             raise RelaxFloatError, ('frequency', frq)
 
         # Execute the functional code.
-        self.__relax__.specific.relax_data.back_calc(run=run, 
ri_label=ri_label, frq_label=frq_label, frq=frq)
+        relax_data.back_calc(ri_label=ri_label, frq_label=frq_label, frq=frq)
 
 
     def copy(self, run1=None, run2=None, ri_label=None, frq_label=None):