r22263 - in /branches/double_rotor: ./ auto_analyses/relax_disp.py -- February 24, 2014 - 10:41

Author: bugman
Date: Mon Feb 24 10:41:43 2014
New Revision: 22263

URL: http://svn.gna.org/viewcvs/relax?rev=22263&view=rev
Log:
Merged revisions 22262 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/trunk

........
  r22262 | bugman | 2014-02-24 10:38:54 +0100 (Mon, 24 Feb 2014) | 5 lines
  
  Fix for a bug introduced at r22250.
  
  The method is called name_pipe(), not pipe_name which is a variable.
........

Modified:
    branches/double_rotor/   (props changed)
    branches/double_rotor/auto_analyses/relax_disp.py

Propchange: branches/double_rotor/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 24 10:41:43 2014
@@ -1,1 +1,1 @@
-/trunk:1-22260
+/trunk:1-22262

Modified: branches/double_rotor/auto_analyses/relax_disp.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/double_rotor/auto_analyses/relax_disp.py?rev=22263&r1=22262&r2=22263&view=diff
==============================================================================
--- branches/double_rotor/auto_analyses/relax_disp.py (original)
+++ branches/double_rotor/auto_analyses/relax_disp.py Mon Feb 24 10:41:43 2014
@@ -457,7 +457,7 @@
 
             # Copy the R2eff values from the R2eff model data pipe.
             if model != MODEL_R2EFF and MODEL_R2EFF in self.models:
-                
self.interpreter.value.copy(pipe_from=self.pipe_name(MODEL_R2EFF), 
pipe_to=model_pipe, param='r2eff')
+                
self.interpreter.value.copy(pipe_from=self.name_pipe(MODEL_R2EFF), 
pipe_to=model_pipe, param='r2eff')
 
             # Calculate the R2eff values for the fixed relaxation time 
period data types.
             if model == MODEL_R2EFF and not has_exponential_exp_type():