r7603 - /1.3/generic_fns/dasha.py -- October 11, 2008 - 21:20

Author: bugman
Date: Sat Oct 11 21:20:18 2008
New Revision: 7603

URL: http://svn.gna.org/viewcvs/relax?rev=7603&view=rev
Log:
Converted the execute() function to the new design.


Modified:
    1.3/generic_fns/dasha.py

Modified: 1.3/generic_fns/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/generic_fns/dasha.py?rev=7603&r1=7602&r2=7603&view=diff
==============================================================================
--- 1.3/generic_fns/dasha.py (original)
+++ 1.3/generic_fns/dasha.py Sat Oct 11 21:20:18 2008
@@ -364,27 +364,31 @@
 
 
 def execute(dir, force, binary):
-    """Function for executing Dasha."""
-
-    # Arguments.
-    self.dir = dir
-    self.force = force
-    self.binary = binary
+    """Execute Dasha.
+
+    @param dir:     The optional directory where the script is located.
+    @type dir:      str or None
+    @param force:   A flag which if True will cause any pre-existing files 
to be overwritten by
+                    Dasha.
+    @type force:    bool
+    @param binary:  The name of the Dasha binary file.  This can include the 
path to the binary.
+    @type binary:   str
+    """
 
     # Test the binary file string corresponds to a valid executable.
-    test_binary(self.binary)
+    test_binary(binary)
 
     # The current directory.
     orig_dir = getcwd()
 
     # The directory.
     if dir == None:
-        dir = pipe
+        dir = pipes.cdp_name()
     if not access(dir, F_OK):
         raise RelaxDirError, ('Dasha', dir)
 
     # Change to this directory.
-    chdir(self.dir)
+    chdir(dir)
 
     # Catch failures and return to the correct directory.
     try: