From 7283bbb6d1d79825a3961e07cd0e6814c935d5e4 Mon Sep 17 00:00:00 2001 From: Marshall Perrin Date: Thu, 5 Dec 2024 20:25:34 -0500 Subject: [PATCH] update MAST query for OPDs to also check FP6. And include field point in load_wss_opd verbose message --- webbpsf/mast_wss.py | 2 +- webbpsf/webbpsf_core.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/webbpsf/mast_wss.py b/webbpsf/mast_wss.py index 7ac1e992..def23240 100644 --- a/webbpsf/mast_wss.py +++ b/webbpsf/mast_wss.py @@ -357,7 +357,7 @@ def infer_pre_or_post_correction(row): return 'UNKNOWN' -def retrieve_mast_opd_table(aperture_list=['NRCA3_FP1'], verbose=False): +def retrieve_mast_opd_table(aperture_list=['NRCA3_FP1', 'NRCA1_FP6'], verbose=False): """Retrieve table of OPDs from MAST. Returns : Astropy table listing available OPDs and metadata such as dates and sensing type. diff --git a/webbpsf/webbpsf_core.py b/webbpsf/webbpsf_core.py index a3145dc8..40efa4b5 100644 --- a/webbpsf/webbpsf_core.py +++ b/webbpsf/webbpsf_core.py @@ -1697,12 +1697,12 @@ def load_wss_opd(self, filename, output_path=None, backout_si_wfe=True, verbose= axes[0, 0].set_xlabel(f'RMS: {utils.rms(opdhdu[0].data*1e9, ote_pupil_mask):.2f} nm rms') if backout_si_wfe: - if verbose: - print('Backing out SI WFE and OTE field dependence at the WF sensing field point') - # Check which field point was used for sensing sensing_apername = opdhdu[0].header['APERNAME'] + if verbose: + print(f'Backing out SI WFE and OTE field dependence at the WF sensing field point ({sensing_apername})') + # Create a temporary instance of an instrument, for the sensng instrument and field point, # in order to model and extract the SI WFE and OTE field dep WFE at the sensing field point.