r11629 - in /branches/bieri_gui: ./ auto_analyses/dauvergne_protocol.py generic_fns/pipes.py -- October 06, 2010 - 12:50

Author: bugman
Date: Wed Oct  6 12:50:53 2010
New Revision: 11629

URL: http://svn.gna.org/viewcvs/relax?rev=11629&view=rev
Log:
Merged revisions 11627-11628 via svnmerge from 
svn+ssh://bugman@xxxxxxxxxxx/svn/relax/1.3

........
  r11627 | bugman | 2010-10-06 12:46:39 +0200 (Wed, 06 Oct 2010) | 3 lines
  
  Added some checks to the dauvergne_protocol mf analysis for the required 
previously optimised results.
........
  r11628 | bugman | 2010-10-06 12:47:20 +0200 (Wed, 06 Oct 2010) | 3 lines
  
  pipe.delete() without args will now delete all data pipes.
........

Modified:
    branches/bieri_gui/   (props changed)
    branches/bieri_gui/auto_analyses/dauvergne_protocol.py
    branches/bieri_gui/generic_fns/pipes.py

Propchange: branches/bieri_gui/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Oct  6 12:50:53 2010
@@ -1,1 +1,1 @@
-/1.3:1-11618
+/1.3:1-11628

Modified: branches/bieri_gui/auto_analyses/dauvergne_protocol.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/auto_analyses/dauvergne_protocol.py?rev=11629&r1=11628&r2=11629&view=diff
==============================================================================
--- branches/bieri_gui/auto_analyses/dauvergne_protocol.py (original)
+++ branches/bieri_gui/auto_analyses/dauvergne_protocol.py Wed Oct  6 
12:50:53 2010
@@ -284,6 +284,11 @@
         #############################
 
         elif self.diff_model == 'sphere' or self.diff_model == 'prolate' or 
self.diff_model == 'oblate' or self.diff_model == 'ellipsoid':
+            # No local_tm directory!
+            dir_list = listdir(getcwd())
+            if 'local_tm' not in dir_list:
+                raise RelaxError("The local_tm model must be optimised 
first.")
+
             # The initial round of optimisation - not zero if calculations 
were interrupted.
             self.start_round = self.determine_rnd(model=self.diff_model)
 
@@ -391,6 +396,12 @@
 
             # All the global diffusion models to be used in the model 
selection.
             self.pipes = ['local_tm', 'sphere', 'prolate', 'oblate', 
'ellipsoid']
+
+            # Missing optimised model.
+            dir_list = listdir(getcwd())
+            for name in self.pipes:
+                if name not in dir_list:
+                    raise RelaxError("The %s model must be optimised first." 
% name)
 
             # Create the local_tm data pipe.
             self.interpreter.pipe.create('local_tm', 'mf')

Modified: branches/bieri_gui/generic_fns/pipes.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bieri_gui/generic_fns/pipes.py?rev=11629&r1=11628&r2=11629&view=diff
==============================================================================
--- branches/bieri_gui/generic_fns/pipes.py (original)
+++ branches/bieri_gui/generic_fns/pipes.py Wed Oct  6 12:50:53 2010
@@ -121,17 +121,27 @@
     @type pipe_name:    str
     """
 
-    # Test if the data pipe exists.
+    # Pipe name is supplied.
     if pipe_name != None:
+        # Test if the data pipe exists.
         test(pipe_name)
 
-    # Delete the data pipe.
-    del ds[pipe_name]
-
-    # Set the current data pipe to None if it is the deleted data pipe.
-    if ds.current_pipe == pipe_name:
-        ds.current_pipe = None
-        __builtin__.cdp = None
+        # Convert to a list.
+        pipes = [pipe_name]
+
+    # All pipes.
+    else:
+        pipes = ds.keys()
+
+    # Loop over the pipes.
+    for pipe in pipes:
+        # Delete the data pipe.
+        del ds[pipe]
+
+        # Set the current data pipe to None if it is the deleted data pipe.
+        if ds.current_pipe == pipe:
+            ds.current_pipe = None
+            __builtin__.cdp = None
 
 
 def display():