Update output scripts with --outroot option

gnarayan · Sep 7, 2017 · 8161aff · 8161aff
1 parent f67d37a
commit 8161aff
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/bin/print_WDmodel_residual_table b/bin/print_WDmodel_residual_table
@@ -24,6 +24,8 @@ def get_options(args=None):
 
     parser.add_argument('--specfiles', nargs='+', required=False, \
             help="Specify spectrum to search for")
+    parser.add_argument('--outroot', required=False,
+            help="Specify a custom output root directory. Directories go under outroot/objname/subdir.")
     parser.add_argument('-o', '--outdir', required=False,\
             help="Specify a custom output directory. Default is CWD+objname/ subdir")
     args = parser.parse_args(args=args)
@@ -48,7 +50,7 @@ def main(inargs=None):
     pbs = pbs.split(',')
 
     for specfile in specfiles:
-        objname, outdir = WDmodel.io.set_objname_outdir_for_specfile(specfile, outdir=args.outdir, resume=True)
+        objname, outdir = WDmodel.io.set_objname_outdir_for_specfile(specfile, outroot=args.outroot, outdir=args.outdir, resume=True)
         outfile = WDmodel.io.get_outfile(outdir, specfile, '_phot_model.dat')
         try:
             phot = WDmodel.io.read_phot(outfile)

diff --git a/bin/print_WDmodel_result_table b/bin/print_WDmodel_result_table
@@ -24,6 +24,8 @@ def get_options(args=None):
 
     parser.add_argument('--specfiles', nargs='+', required=False, \
             help="Specify spectrum to search for")
+    parser.add_argument('--outroot', required=False,
+            help="Specify a custom output root directory. Directories go under outroot/objname/subdir.")
     parser.add_argument('-o', '--outdir', required=False,\
             help="Specify a custom output directory. Default is CWD+objname/ subdir")
     args = parser.parse_args(args=args)
@@ -46,7 +48,7 @@ def main(inargs=None):
     colbool = False
 
     for specfile in specfiles:
-        objname, outdir = WDmodel.io.set_objname_outdir_for_specfile(specfile, outdir=args.outdir, resume=True)
+        objname, outdir = WDmodel.io.set_objname_outdir_for_specfile(specfile, outroot=args.outroot, outdir=args.outdir, resume=True)
         outfile = WDmodel.io.get_outfile(outdir, specfile, '_result.json')
         try:
             params = WDmodel.io.read_params(outfile)