From 7faca457b5f8367b66c8df73c9e90a8291cc6948 Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Mon, 1 Feb 2021 08:40:55 -0500 Subject: [PATCH] fixup --- agasc/scripts/update_mag_supplement.py | 11 +++++++---- agasc/supplement/magnitudes/update_mag_supplement.py | 11 ++--------- 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/agasc/scripts/update_mag_supplement.py b/agasc/scripts/update_mag_supplement.py index 14c6ab73..adc6a31f 100755 --- a/agasc/scripts/update_mag_supplement.py +++ b/agasc/scripts/update_mag_supplement.py @@ -77,10 +77,13 @@ def main(): else: args.reports_dir = Path(os.path.expandvars(args.reports_dir)) - if args.whole_history and (args.start or args.stop): - logger.error('--whole-history argument is incompatible with --start/--stop arguments') - the_parser.exit(1) - + if args.whole_history: + if args.start or args.stop: + logger.error('--whole-history argument is incompatible with --start/--stop arguments') + the_parser.exit(1) + args.start = None + args.stop = None + pyyaks.logger.get_logger( name='agasc.supplement', level=args.log_level.upper(), diff --git a/agasc/supplement/magnitudes/update_mag_supplement.py b/agasc/supplement/magnitudes/update_mag_supplement.py index d0c1b0e4..0525fb23 100755 --- a/agasc/supplement/magnitudes/update_mag_supplement.py +++ b/agasc/supplement/magnitudes/update_mag_supplement.py @@ -312,11 +312,6 @@ def do(output_dir, # as ascii. It displays a warning which I want to avoid: warnings.filterwarnings("ignore", category=tables.exceptions.FlavorWarning) - if start: - start = CxoTime(start) - if stop: - stop = CxoTime(stop) - filename = output_dir / 'agasc_supplement.h5' if multi_process: @@ -336,10 +331,8 @@ def do(output_dir, if agasc_ids is None: agasc_ids = sorted(star_obs_catalogs.STARS_OBS['agasc_id']) else: - if not stop: - stop = CxoTime.now().date - if not start: - start = (CxoTime(stop) - 14 * u.day).date + stop = CxoTime(stop).date if stop else CxoTime.now().date + start = CxoTime(start).date if start else (CxoTime(stop) - 14 * u.day).date obs_in_time = ((star_obs_catalogs.STARS_OBS['mp_starcat_time'] >= start) & (star_obs_catalogs.STARS_OBS['mp_starcat_time'] <= stop)) agasc_ids = sorted(star_obs_catalogs.STARS_OBS[obs_in_time]['agasc_id'])