Skip to content

Commit

Permalink
RTD webbpsf path fix
Browse files Browse the repository at this point in the history
  • Loading branch information
JarronL committed Jan 10, 2018
1 parent 8a3ace5 commit 5074357
Showing 1 changed file with 17 additions and 14 deletions.
31 changes: 17 additions & 14 deletions pynrc/nrc_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,22 +111,25 @@

# Default OPD info
opd_default = ('OPD_RevW_ote_for_NIRCam_requirements.fits', 0)
# .fits or .fits.gz?
opd_dir = os.path.join(webbpsf.utils.get_webbpsf_data_path(),'NIRCam','OPD')
opd_file = os.path.join(opd_dir,opd_default[0])
if not os.path.exists(opd_file):
opd_file_alt = opd_file + '.gz'
if not os.path.exists(opd_file_alt):
f1 = os.path.basename(opd_file)
f2 = os.path.basename(opd_file_alt)
err_msg = 'Cannot find either {} or {} in directory {}'.format(f1, f2, opd_dir)
raise OSError(err_msg)
else:
opd_default = ('OPD_RevW_ote_for_NIRCam_requirements.fits.gz', 0)

# The following won't work on readthedocs compilation
if not on_rtd:
# .fits or .fits.gz?
opd_dir = os.path.join(webbpsf.utils.get_webbpsf_data_path(),'NIRCam','OPD')
opd_file = os.path.join(opd_dir,opd_default[0])
if not os.path.exists(opd_file):
opd_file_alt = opd_file + '.gz'
if not os.path.exists(opd_file_alt):
f1 = os.path.basename(opd_file)
f2 = os.path.basename(opd_file_alt)
err_msg = 'Cannot find either {} or {} in directory {}'.format(f1, f2, opd_dir)
raise OSError(err_msg)
else:
opd_default = ('OPD_RevW_ote_for_NIRCam_requirements.fits.gz', 0)


import errno
raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), opd_file)
import errno
raise FileNotFoundError(errno.ENOENT, os.strerror(errno.ENOENT), opd_file)

###########################################################################
#
Expand Down

0 comments on commit 5074357

Please sign in to comment.