diff --git a/py/desisurvey/data/config-cmx.yaml b/py/desisurvey/data/config-cmx.yaml index 7cb5dcf6..3cff13f5 100644 --- a/py/desisurvey/data/config-cmx.yaml +++ b/py/desisurvey/data/config-cmx.yaml @@ -167,7 +167,7 @@ tile_radius: 1.63 deg # - Pass numbers are arbitrary integers and do not need to be consecutive # or dense. However use of non-standard values will generally require # an update to fiber_assignment_order, above. -tiles_file: CMX_58_DITHERED_TILES_Jan2020_s.fits +tiles_file: SV0_612tiles_March2020_uniquepassprogram.fits commissioning: True # tile file is a commissioning tile file. This disables checks related diff --git a/py/desisurvey/scripts/afternoon_plan.py b/py/desisurvey/scripts/afternoon_plan.py index aa5079b2..a61ea8f0 100644 --- a/py/desisurvey/scripts/afternoon_plan.py +++ b/py/desisurvey/scripts/afternoon_plan.py @@ -101,14 +101,14 @@ def afternoon_plan(night=None, restore_etc_stats=None, configfn='config.yaml', if configfn is None: configfn = desisurvey.config.Configuration._get_full_path( 'config.yaml') + if not os.path.exists(configfn): + configfn = desisurvey.config.Configuration._get_full_path(configfn) # figuring out the current date requires having already loaded a # configuration file; we need to get rid of that. desisurvey.config.Configuration.reset() config = desisurvey.config.Configuration(configfn) log.info('Loading configuration from {}...'.format(configfn)) - if not os.path.exists(configfn): - configfn = desisurvey.config.Configuration._get_full_path(configfn) tilefn = config.get_path(config.tiles_file()) rulesfn = config.get_path(config.rules_file()) if not os.path.exists(tilefn): diff --git a/py/desisurvey/scripts/collect_etc.py b/py/desisurvey/scripts/collect_etc.py index 69f8b8a4..22852f51 100644 --- a/py/desisurvey/scripts/collect_etc.py +++ b/py/desisurvey/scripts/collect_etc.py @@ -219,8 +219,11 @@ def read_tile_exp(fn): help='file to write out') parser.add_argument('--start_from', type=str, default=None, help='etc_stats file to start from') + parser.add_argument('--simulate_donefrac', action='store_true', + help='use exptime/1000 instead of DONEFRAC') args = parser.parse_args() - res = scan_directory(args.directory, start_from=args.start_from) + res = scan_directory(args.directory, start_from=args.start_from, + simulate_donefrac=args.simulate_donefrac) if res is not None: tiles, exps = res write_tile_exp(tiles, exps, args.outfile)