Changeset 3303 for trunk

Timestamp:

02/07/12 15:24:02 (4 months ago)

Author:

jos

Message:

Move mcstas.dat into optimise_dir and correct filepath in header (should work with mcplot.pl now)

Location:

trunk/src/mcrun2

Files:

• main.py (modified) (3 diffs)
• optimisation.py (modified) (3 diffs)

trunk/src/mcrun2/main.py

@@ -1 +1 @@
 #!/usr/bin/env python2.6
 
+from os import mkdir
 from os.path import isfile, isdir, abspath, dirname
 from optparse import OptionParser, OptionGroup, OptionValueError
@@ -85 +86 @@
 
     add('--optimise-file',
-        metavar='FILE', default='./mcstas.dat',
+        metavar='FILE',
         help='store optimisation results in FILE '
              '(defaults to: "mcstas.dat")')
@@ -190 +191 @@
         options.use_mpi = False
         options.cc = 'gcc'
-    # Output DIR
+    # Output dir
     if options.dir is None:
         # use unique directory when unspecified
         options.dir = "./mcstas-%s" % (datetime.strftime(datetime.now(),
                                                          DATE_FORMAT_PATH))
-        # alert the user
+        # alert user
         LOG.info('No output directory specified (--dir)')
+        # create dir
+        try:
+            mkdir(options.dir)
+        except OSError:
+            pass  # dir exists
+    # Output file
+    if options.optimise_file is None:
+        # use mcstas.dat when unspecified
+        options.optimise_file = '%s/mcstas.dat' % options.dir
+
 
 

trunk/src/mcrun2/optimisation.py

@@ -1 @@
-from os import mkdir
+from os.path import basename
 
 from log import McRunException
@@ -64 +64 @@
         'xmax': xmax,
 
-        'filename': options.optimise_file or 'mcstas.dat',
+        'filename': basename(options.optimise_file) or 'mcstas.dat',
         'variables': ' '.join(variables),
     }
@@ -137 +137 @@
         wrote_header = False
 
-        # create top level
         # each run will be in "dir/1", "dir/2", ...
         mcstas_dir = self.mcstas.options.dir
-        mkdir(mcstas_dir)
 
         for i, point in enumerate(self.points):