Skip to content

Commit

Permalink
simulate donefrac if requested; update cmx tilefile
Browse files Browse the repository at this point in the history
  • Loading branch information
schlafly committed Jun 12, 2020
1 parent 64a51a5 commit 74df6f8
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion py/desisurvey/data/config-cmx.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions py/desisurvey/scripts/afternoon_plan.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
5 changes: 4 additions & 1 deletion py/desisurvey/scripts/collect_etc.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)

0 comments on commit 74df6f8

Please sign in to comment.