r22267 - in /branches/double_rotor: ./ auto_analyses/relax_disp.py -- February 24, 2014 - 10:46

Author: bugman
Date: Mon Feb 24 10:46:21 2014
New Revision: 22267

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

........
  r22266 | bugman | 2014-02-24 10:46:02 +0100 (Mon, 24 Feb 2014) | 6 lines
  
  Fix for the model nesting part of the relaxation dispersion auto-analysis.
  
  This was recently broken at r22250.  The nested pipe name needs to be 
passed through the name_pipe()
  method to obtain the correct pipe name.
........

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:46:21 2014
@@ -1,1 +1,1 @@
-/trunk:1-22264
+/trunk:1-22266

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=22267&r1=22266&r2=22267&view=diff
==============================================================================
--- branches/double_rotor/auto_analyses/relax_disp.py (original)
+++ branches/double_rotor/auto_analyses/relax_disp.py Mon Feb 24 10:46:21 2014
@@ -248,41 +248,41 @@
         # The simpler model.
         nested_pipe = None
         if model == MODEL_LM63_3SITE and MODEL_LM63 in self.models:
-            nested_pipe = MODEL_LM63
+            nested_pipe = self.name_pipe(MODEL_LM63)
         if model == MODEL_CR72_FULL and MODEL_CR72 in self.models:
-            nested_pipe = MODEL_CR72
+            nested_pipe = self.name_pipe(MODEL_CR72)
         if model == MODEL_MMQ_CR72 and MODEL_CR72 in self.models:
-            nested_pipe = MODEL_CR72
+            nested_pipe = self.name_pipe(MODEL_CR72)
         if model == MODEL_NS_CPMG_2SITE_3D_FULL and MODEL_NS_CPMG_2SITE_3D 
in self.models:
-            nested_pipe = MODEL_NS_CPMG_2SITE_3D
+            nested_pipe = self.name_pipe(MODEL_NS_CPMG_2SITE_3D)
         if model == MODEL_NS_CPMG_2SITE_STAR_FULL and 
MODEL_NS_CPMG_2SITE_STAR in self.models:
-            nested_pipe = MODEL_NS_CPMG_2SITE_STAR
+            nested_pipe = self.name_pipe(MODEL_NS_CPMG_2SITE_STAR)
         if model == MODEL_NS_MMQ_3SITE_LINEAR and MODEL_NS_MMQ_2SITE in 
self.models:
-            nested_pipe = MODEL_NS_MMQ_2SITE
+            nested_pipe = self.name_pipe(MODEL_NS_MMQ_2SITE)
         if model == MODEL_NS_MMQ_3SITE:
             if MODEL_NS_MMQ_3SITE_LINEAR in self.models:
-                nested_pipe = MODEL_NS_MMQ_3SITE_LINEAR
+                nested_pipe = self.name_pipe(MODEL_NS_MMQ_3SITE_LINEAR)
             elif MODEL_NS_MMQ_2SITE in self.models:
-                nested_pipe = MODEL_NS_MMQ_2SITE
+                nested_pipe = self.name_pipe(MODEL_NS_MMQ_2SITE)
         if model == MODEL_NS_R1RHO_3SITE_LINEAR and MODEL_NS_R1RHO_2SITE in 
self.models:
-            nested_pipe = MODEL_NS_R1RHO_2SITE
+            nested_pipe = self.name_pipe(MODEL_NS_R1RHO_2SITE)
         if model == MODEL_NS_R1RHO_3SITE:
             if MODEL_NS_R1RHO_3SITE_LINEAR in self.models:
-                nested_pipe = MODEL_NS_R1RHO_3SITE_LINEAR
+                nested_pipe = self.name_pipe(MODEL_NS_R1RHO_3SITE_LINEAR)
             elif MODEL_NS_R1RHO_2SITE in self.models:
-                nested_pipe = MODEL_NS_R1RHO_2SITE
+                nested_pipe = self.name_pipe(MODEL_NS_R1RHO_2SITE)
 
 
         # Using the analytic solution.
         analytic = False
         if model in [MODEL_NS_CPMG_2SITE_3D, MODEL_NS_CPMG_2SITE_EXPANDED, 
MODEL_NS_CPMG_2SITE_STAR] and MODEL_CR72 in self.models:
-            nested_pipe = MODEL_CR72
+            nested_pipe = self.name_pipe(MODEL_CR72)
             analytic = True
         elif model == MODEL_NS_MMQ_2SITE and MODEL_MMQ_CR72 in self.models:
-            nested_pipe = MODEL_MMQ_CR72
+            nested_pipe = self.name_pipe(MODEL_MMQ_CR72)
             analytic = True
         if model == MODEL_NS_R1RHO_2SITE and MODEL_MP05 in self.models:
-            nested_pipe = MODEL_MP05
+            nested_pipe = self.name_pipe(MODEL_MP05)
             analytic = True
 
         # No nesting.