r22290 - in /branches/double_rotor: ./ auto_analyses/relax_disp.py -- February 24, 2014 - 16:40

Author: bugman
Date: Mon Feb 24 16:40:09 2014
New Revision: 22290

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

........
  r22287 | bugman | 2014-02-24 15:17:35 +0100 (Mon, 24 Feb 2014) | 3 lines
  
  More fixes for the relaxation dispersion auto-analysis for the pipe names 
now including the bundle name.
........
  r22288 | bugman | 2014-02-24 16:29:07 +0100 (Mon, 24 Feb 2014) | 3 lines
  
  Added some missing RelaxError imports to the dispersion auto-analysis.
........

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 16:40:09 2014
@@ -1,1 +1,1 @@
-/trunk:1-22285
+/trunk:1-22288

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=22290&r1=22289&r2=22290&view=diff
==============================================================================
--- branches/double_rotor/auto_analyses/relax_disp.py (original)
+++ branches/double_rotor/auto_analyses/relax_disp.py Mon Feb 24 16:40:09 2014
@@ -29,6 +29,7 @@
 from warnings import warn
 
 # relax module imports.
+from lib.errors import RelaxError, RelaxNoPipeError
 from lib.list import unique_elements
 from lib.text.sectioning import section, subsection, subtitle, title
 from lib.warnings import RelaxWarning
@@ -404,10 +405,10 @@
         self.interpreter.results.read(file='results', dir=path)
 
         # Copy the parameters.
-        self.interpreter.relax_disp.parameter_copy(pipe_from=pipe_name, 
pipe_to=model)
+        self.interpreter.relax_disp.parameter_copy(pipe_from=pipe_name, 
pipe_to=self.name_pipe(model))
 
         # Finally, switch back to the original data pipe and delete the 
temporary one.
-        self.interpreter.pipe.switch(pipe_name=model)
+        self.interpreter.pipe.switch(pipe_name=self.name_pipe(model))
         self.interpreter.pipe.delete(pipe_name=pipe_name)