r26178 - in /branches/frame_order_cleanup: ./ auto_analyses/relax_disp_repeat_cpmg.py -- October 07, 2014 - 13:57

Author: bugman
Date: Tue Oct  7 13:57:30 2014
New Revision: 26178

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

........
  r26142 | tlinnet | 2014-10-02 21:55:58 +0200 (Thu, 02 Oct 2014) | 3 lines
  
  Skippping of intensity calculation, if the intensity pipe does not exists.
  
  Task #7826 (https://gna.org/task/index.php?7826): Write an python class for 
the repeated analysis of dispersion data.
........

Modified:
    branches/frame_order_cleanup/   (props changed)
    branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py

Propchange: branches/frame_order_cleanup/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Oct  7 13:57:30 2014
@@ -1 +1 @@
-/trunk:1-26139
+/trunk:1-26139,26142

Modified: branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py?rev=26178&r1=26177&r2=26178&view=diff
==============================================================================
--- branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py      
  (original)
+++ branches/frame_order_cleanup/auto_analyses/relax_disp_repeat_cpmg.py      
  Tue Oct  7 13:57:30 2014
@@ -1050,8 +1050,11 @@
             if not pipes.has_pipe(pipe_name):
                 self.set_int(methods=[method], list_glob_ini=[glob_ini])
 
-            if pipes.cdp_name() != pipe_name:
+            if pipes.cdp_name() != pipe_name and pipes.has_pipe(pipe_name):
                 self.interpreter.pipe.switch(pipe_name)
+
+            elif pipes.has_pipe(pipe_name) == False:
+                continue
 
             # Results dictionary.
             res_dic[str(glob_ini)] = {}