r7054 - /1.3/prompt/dasha.py -- July 31, 2008 - 23:39

Author: semor
Date: Thu Jul 31 22:08:08 2008
New Revision: 7054

URL: http://svn.gna.org/viewcvs/relax?rev=7054&view=rev
Log:
More removal of run arguments.

These changes are part of the new design.


Modified:
    1.3/prompt/dasha.py

Modified: 1.3/prompt/dasha.py
URL: 
http://svn.gna.org/viewcvs/relax/1.3/prompt/dasha.py?rev=7054&r1=7053&r2=7054&view=diff
==============================================================================
--- 1.3/prompt/dasha.py (original)
+++ 1.3/prompt/dasha.py Thu Jul 31 22:08:08 2008
@@ -41,17 +41,15 @@
         self.__relax__ = relax
 
 
-    def create(self, run=None, algor='LM', dir=None, force=False):
+    def create(self, algor='LM', dir=None, force=False):
         """Function for creating the Dasha script.
 
         Keyword Arguments
         ~~~~~~~~~~~~~~~~~
 
-        run:  The name of the run.
-
         algor:  The minimisation algorithm.
 
-        dir:  The directory to place the files.  The default is the value of 
'run'.
+        dir:  The directory to place the files.
 
         force:  A flag which if set to True will cause the results file to 
be overwritten if it
         already exists.
@@ -79,15 +77,10 @@
         # Function intro text.
         if self.__relax__.interpreter.intro:
             text = sys.ps3 + "dasha.create("
-            text = text + "run=" + `run`
             text = text + ", algor=" + `algor`
             text = text + ", dir=" + `dir`
             text = text + ", force=" + `force` + ")"
             print text
-
-        # The run argument.
-        if type(run) != str:
-            raise RelaxStrError, ('run', run)
 
         # The algor argument.
         if type(algor) != str:
@@ -103,18 +96,16 @@
             raise RelaxBoolError, ('force flag', force)
 
         # Execute the functional code.
-        self.__relax__.generic.dasha.create(run=run, algor=algor, dir=dir, 
force=force)
+        self.__relax__.generic.dasha.create(algor=algor, dir=dir, 
force=force)
 
 
-    def execute(self, run=None, dir=None, force=False, binary='dasha'):
+    def execute(self, dir=None, force=False, binary='dasha'):
         """Function for executing Dasha.
 
         Keyword Arguments
         ~~~~~~~~~~~~~~~~~
 
-        run:  The name of the run.
-
-        dir:  The directory to place the files.  The default is the value of 
'run'.
+        dir:  The directory to place the files.
 
         force:  A flag which if set to True will cause the results file to 
be overwritten if it
         already exists.
@@ -138,15 +129,10 @@
         # Function intro text.
         if self.__relax__.interpreter.intro:
             text = sys.ps3 + "dasha.execute("
-            text = text + "run=" + `run`
             text = text + ", dir=" + `dir`
             text = text + ", force=" + `force`
             text = text + ", binary=" + `binary` + ")"
             print text
-
-        # The run argument.
-        if type(run) != str:
-            raise RelaxStrError, ('run', run)
 
         # Directory.
         if dir != None:
@@ -162,30 +148,23 @@
             raise RelaxStrError, ('Dasha binary', binary)
 
         # Execute the functional code.
-        self.__relax__.generic.dasha.execute(run=run, dir=dir, force=force, 
binary=binary)
+        self.__relax__.generic.dasha.execute(dir=dir, force=force, 
binary=binary)
 
 
-    def extract(self, run=None, dir=None):
+    def extract(self, dir=None):
         """Function for extracting data from the Dasha results file.
 
         Keyword Arguments
         ~~~~~~~~~~~~~~~~~
 
-        run:  The name of the run.
-
-        dir:  The directory where the file 'dasha_results' is found.  The 
default is the value of 'run'.
+        dir:  The directory where the file 'dasha_results' is found. 
         """
 
         # Function intro text.
         if self.__relax__.interpreter.intro:
             text = sys.ps3 + "dasha.extract("
-            text = text + "run=" + `run`
             text = text + ", dir=" + `dir` + ")"
             print text
-
-        # The run argument.
-        if type(run) != str:
-            raise RelaxStrError, ('run', run)
 
         # Directory.
         if dir != None:
@@ -193,4 +172,4 @@
                 raise RelaxNoneStrError, ('directory name', dir)
 
         # Execute the functional code.
-        self.__relax__.generic.dasha.extract(run=run, dir=dir)
+        self.__relax__.generic.dasha.extract(dir=dir)