r9856 - in /branches/bmrb: data/exp_info.py generic_fns/exp_info.py -- October 29, 2009 - 17:31

Author: bugman
Date: Thu Oct 29 17:31:53 2009
New Revision: 9856

URL: http://svn.gna.org/viewcvs/relax?rev=9856&view=rev
Log:
The directory info is being stored in the script container.


Modified:
    branches/bmrb/data/exp_info.py
    branches/bmrb/generic_fns/exp_info.py

Modified: branches/bmrb/data/exp_info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/data/exp_info.py?rev=9856&r1=9855&r2=9856&view=diff
==============================================================================
--- branches/bmrb/data/exp_info.py (original)
+++ branches/bmrb/data/exp_info.py Thu Oct 29 17:31:53 2009
@@ -184,11 +184,13 @@
         self.thiol_state = state
 
 
-    def setup_script(self, file=None, cite_ids=None, text=None, 
analysis_type=None, model_selection=None, engine=None, model_elim=False, 
universal_solution=False):
+    def setup_script(self, file=None, dir=None, cite_ids=None, text=None, 
analysis_type=None, model_selection=None, engine=None, model_elim=False, 
universal_solution=False):
         """Specify the scripts used in the analysis.
 
-        @param file:                    The name of the script file.
+        @keyword file:                  The name of the script file.
         @type file:                     str
+        @keyword dir:                   The directory containing the file 
(defaults to the current directory if None).
+        @type dir:                      None or str
         @keyword cite_ids:              The citation ID numbers.
         @type cite_ids:                 None or str
         @param text:                    The script text.
@@ -227,6 +229,7 @@
 
         # Set the attributes.
         script.file = file
+        script.dir = dir
         script.cite_ids = cite_ids
         script.text = text
         script.analysis_type = analysis_type

Modified: branches/bmrb/generic_fns/exp_info.py
URL: 
http://svn.gna.org/viewcvs/relax/branches/bmrb/generic_fns/exp_info.py?rev=9856&r1=9855&r2=9856&view=diff
==============================================================================
--- branches/bmrb/generic_fns/exp_info.py (original)
+++ branches/bmrb/generic_fns/exp_info.py Thu Oct 29 17:31:53 2009
@@ -263,9 +263,9 @@
 def script(file=None, dir=None, analysis_type=None, model_selection=None, 
engine=None, model_elim=False, universal_solution=False):
     """Specify the scripts used in the analysis.
 
-    @param file:                    The name of the file to open.
+    @keyword file:                  The name of the file to open.
     @type file:                     str
-    @param dir:                     The directory containing the file 
(defaults to the current directory if None).
+    @keyword dir:                   The directory containing the file 
(defaults to the current directory if None).
     @type dir:                      None or str
     @keyword analysis_type:         The type of analysis performed.
     @type analysis_type:            str
@@ -301,7 +301,7 @@
     f.close()
 
     # Place the data in the container.
-    cdp.exp_info.setup_script(file=file, text=text, 
analysis_type=analysis_type, model_selection=model_selection, engine=engine, 
model_elim=model_elim, universal_solution=universal_solution)
+    cdp.exp_info.setup_script(file=file, dir=dir, text=text, 
analysis_type=analysis_type, model_selection=model_selection, engine=engine, 
model_elim=model_elim, universal_solution=universal_solution)
 
 
 def software(name=None, version=None, url=None, vendor_name=None, 
cite_ids=None, tasks=None):