r19246 - in /branches/relax_disp: specific_analyses/relax_disp.py user_functions/relax_disp.py -- March 27, 2013 - 15:39

Author: bugman
Date: Wed Mar 27 15:39:15 2013
New Revision: 19246

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

The command used was:
svn merge -r8718:8719 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/branches/relax_disp/specific_fns/@r18123
 specific_analyses

The prompt package changes were manually ported to the user_functions package.

.....
  r8719 | semor | 2009-02-02 23:55:37 +0100 (Mon, 02 Feb 2009) | 5 lines
  Changed paths:
     M /branches/relax_disp/prompt/relax_disp.py
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Removed the obsolete function 'relax_disp.r2eff_read()'.
  
  R2eff values will be read directly by 'relax_data.read()' (see r8702 and 
r8703).
.....


Modified:
    branches/relax_disp/specific_analyses/relax_disp.py
    branches/relax_disp/user_functions/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=19246&r1=19245&r2=19246&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 15:39:15 
2013
@@ -1101,14 +1101,6 @@
                 continue
 
 
-    def r2eff_read(self):
-        """Function for reading 'R2eff' values directly, instead of 
calculating them within relax
-        starting from the intensities.
-
-        THIS FUNCTION IS NOT WRITTEN YET.
-        """
-
-
     def return_data(self, spin):
         """Function for returning the peak intensity data structure.
 

Modified: branches/relax_disp/user_functions/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/relax_disp/user_functions/relax_disp.py?rev=19246&r1=19245&r2=19246&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Wed Mar 27 15:39:15 2013
@@ -170,18 +170,6 @@
 uf.desc[-1].add_prompt("relax> relax_disp.exp_type(exp_type='cpmg')")
 uf.backend = relax_disp_obj._exp_type
 uf.menu_text = "&exp_type"
-uf.wizard_size = (800, 500)
-
-
-# The relax_disp.r2eff_read user function.
-uf = uf_info.add_uf('relax_disp.r2eff_read')
-uf.title = "Read R2eff values directly, instead of calculating them within 
relax starting from the intensities.Select the type of relaxation dispersion 
experiments to analyse."
-uf.title_short = "R2eff value reading."
-# Description.
-uf.desc.append(Desc_container())
-uf.desc[-1].add_paragraph("THIS FUNCTION IS NOT WRITTEN YET.")
-uf.backend = relax_disp_obj._r2eff_read
-uf.menu_text = "&r2eff_read"
 uf.wizard_size = (800, 500)