From 8161aff1071af2cca511aa1e02cd82edb3cfaa23 Mon Sep 17 00:00:00 2001 From: Gautham Narayan Date: Thu, 7 Sep 2017 15:47:33 -0400 Subject: [PATCH] Update output scripts with --outroot option --- bin/print_WDmodel_residual_table | 4 +++- bin/print_WDmodel_result_table | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/print_WDmodel_residual_table b/bin/print_WDmodel_residual_table index 15e5279..943a5fe 100755 --- 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 index fad2e47..6e00783 100755 --- 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)