Merge pull request #678 from jeffriley/more-minor-fixes

Minor fixes

Author: jeffriley

examples/methods_paper_plots/chirpmass_distribution/pythonSubmit.py

@@ -1,9 +1,11 @@
 import numpy as np
-import subprocess
 import sys
 import os
 import pickle
-import itertools 
+import itertools
+import re
+import ntpath
+import subprocess
 from subprocess import call
 
 # Check if we are using python 3
@@ -106,18 +108,28 @@ class pythonProgramOptions:
     grid_filename = None                                        # grid file name (e.g. 'mygrid.txt')
 
     if grid_filename != None:
-        if compas_input_path_override == None:
-            grid_filename = os.getcwd() + '/' + grid_filename
-        else:
-            grid_filename = compas_input_path_override + '/' + grid_filename
+        # if the grid filename supplied is already fully-qualified, leave it as is
+        head, tail = ntpath.split(grid_filename)                # split into pathname and base filename
+        
+        if head == '' or head == '.':                           # no path (or CWD) - add path as required
+            grid_filename = tail or ntpath.basename(head)
+            if compas_input_path_override == None:
+                grid_filename = os.getcwd() + '/' + grid_filename.strip("'\"")
+            else:
+                grid_filename = compas_input_path_override + '/' + grid_filename.strip("'\"")
 
     logfile_definitions = "COMPAS_Output_Definitions.txt"       # logfile record definitions file name (e.g. 'logdefs.txt')
 
     if logfile_definitions != None:
-        if compas_input_path_override == None:
-            logfile_definitions = os.getcwd() + '/' + logfile_definitions
-        else:
-            logfile_definitions = compas_input_path_override + '/' + logfile_definitions
+        # if the grid filename supplied is already fully-qualified, leave it as is
+        head, tail = ntpath.split(logfile_definitions)          # split into pathname and base filename
+        
+        if head == '' or head == '.':                           # no path (or CWD) - add path as required
+            logfile_definitions = tail or ntpath.basename(head)
+            if compas_input_path_override == None:
+                logfile_definitions = os.getcwd() + '/' + logfile_definitions.strip("'\"")
+            else:
+                logfile_definitions = compas_input_path_override + '/' + logfile_definitions.strip("'\"")
 
     initial_mass    = None                                      # initial mass for SSE
     initial_mass_1  = None                                      # primary initial mass for BSE