r19225 - in /branches/relax_disp: specific_analyses/relax_disp.py user_functions/relax_disp.py -- March 27, 2013 - 14:49

Author: bugman
Date: Wed Mar 27 14:49:26 2013
New Revision: 19225

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

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

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

.....
  r8472 | semor | 2009-01-15 15:04:33 +0100 (Thu, 15 Jan 2009) | 9 lines
  Changed paths:
     M /branches/relax_disp/prompt/relax_disp.py
     M /branches/relax_disp/specific_fns/relax_disp.py
  
  Started to implement a function for reading 'R2eff' values directly.
  
  This is as proposed in a post at:
  https://mail.gna.org/public/relax-devel/2009-01/msg00020.html
  (Message-id: <7f080ed10901070529s397f7f23p914c820ced4d07f@xxxxxxxxxxxxxx>)
  
  The function does not contain code yet.
.....


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=19225&r1=19224&r2=19225&view=diff
==============================================================================
--- branches/relax_disp/specific_analyses/relax_disp.py (original)
+++ branches/relax_disp/specific_analyses/relax_disp.py Wed Mar 27 14:49:26 
2013
@@ -1084,6 +1084,14 @@
                 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=19225&r1=19224&r2=19225&view=diff
==============================================================================
--- branches/relax_disp/user_functions/relax_disp.py (original)
+++ branches/relax_disp/user_functions/relax_disp.py Wed Mar 27 14:49:26 2013
@@ -123,6 +123,18 @@
 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)
+
+
 # The relax_disp.select_model user function.
 uf = uf_info.add_uf('relax_disp.select_model')
 uf.title = "Select the relaxation dispersion curve type."