Merge branch 'develop' into distortion_update

spacetelescope · Jul 27, 2023 · 5685897 · 5685897
2 parents b4fdee2 + 427b93d
commit 5685897
Show file tree

Hide file tree

Showing 17 changed files with 3,707 additions and 665 deletions.
diff --git a/.github/workflows/ci_workflows.yml b/.github/workflows/ci_workflows.yml
@@ -58,7 +58,7 @@ jobs:
 
     - name: Get WebbPSF Data
       run: | # Get WebbPSF data files (just a subset of the full dataset!) and set up environment variable
-           wget https://stsci.box.com/shared/static/n1fealx9q0m6sdnass6wnyfikvxtc0zz.gz  -O /tmp/minimal-webbpsf-data.tar.gz
+           wget https://stsci.box.com/shared/static/ykkvequ9cbble6qg88ldhjoep4m9ey6x.gz -O /tmp/minimal-webbpsf-data.tar.gz
            tar -xzvf /tmp/minimal-webbpsf-data.tar.gz
            echo "WEBBPSF_PATH=${{github.workspace}}/webbpsf-data" >> $GITHUB_ENV
 

diff --git a/dev_utils/Get Throughputs from Pandeia.ipynb b/dev_utils/Get Throughputs from Pandeia.ipynb
diff --git a/dev_utils/MIMF_FP_Table_From_WAG.xlsx b/dev_utils/MIMF_FP_Table_From_WAG.xlsx
diff --git a/dev_utils/Plot SI MIMF Field Point Locations Wall Chart.ipynb b/dev_utils/Plot SI MIMF Field Point Locations Wall Chart.ipynb
diff --git a/dev_utils/Plot SI WFE Field Dependence.ipynb b/dev_utils/Plot SI WFE Field Dependence.ipynb
diff --git a/requirements.txt b/requirements.txt
@@ -1,10 +1,10 @@
-astropy==5.2.1
-ipython==8.11.0
+astropy==5.3
+ipython==8.14.0
 matplotlib==3.7.0
-numpy==1.24.2
-photutils==1.6.0
+numpy==1.25.1
+photutils==1.8.0
 poppy>=1.0.0
 pysiaf==0.19.1
-scipy==1.10.1
-synphot==1.1.1
+scipy==1.11.1
+synphot==1.2.1
 astroquery==0.4.6
diff --git a/webbpsf/__init__.py b/webbpsf/__init__.py
@@ -40,7 +40,7 @@ class UnsupportedPythonError(Exception):
 # required. If changes to the code and data mean WebbPSF won't work
 # properly with an old data package, increment this version number.
 # (It's checked against $WEBBPSF_DATA/version.txt)
-DATA_VERSION_MIN = (1, 1, 1)
+DATA_VERSION_MIN = (1, 2, 0)
 
 
 class Conf(_config.ConfigNamespace):

diff --git a/webbpsf/constants.py b/webbpsf/constants.py
@@ -243,3 +243,29 @@
 JWST_INSCRIBED_DIAMETER = 5.47334  # meters. Middle corners of C segments
 
 JWST_TYPICAL_LOS_JITTER_PER_AXIS = 0.0008 # milliarcseconds jitter, 1 sigma per axis. = approx 1 mas rms radial, typically
+
+
+# ad hoc, highly simplified models for charge diffusion within detectors
+# These values are PLACEHOLDERS and should be updated based on comparisons with data and ePSFs (ongoing)
+# Note, these are parameterized as arcseconds for convenience (and consistency with the jitter paramater)
+# but the underlying physics cares more about detector pixel pitch.
+INSTRUMENT_DETECTOR_CHARGE_DIFFUSION_DEFAULT_PARAMETERS = {
+    'NIRCAM_SW': 0.0062,    # Fit by Marcio to WFS TA ePSFs, and by Marshall to prelim NIRCam SW ePSFs by J. Anderson
+    'NIRCAM_LW': 0.018,     # Fit by Marshall to prelim LW ePSFs by J. Anderson
+    'NIRISS': 0.0202,       # Fit by Marcio to MIMF-3 F158M (ePSF), and by Marshall to NIRISS ePSFs by Anderson & Libralato
+    'FGS': 0.07,            # Fit by Marcio to FGS_ID images
+    'NIRSPEC': 0.036,
+    'MIRI': 0.001,          # Fit by Marshall + Marcio to ePSFs, after adding IPC
+                            #  0.070 Based on user reports, see issue #674. However, this was before adding IPC effects
+}
+# add Interpixel capacitance (IPC) effects. These are the parameters for each detector kernel
+# For NIRCam we  use CV3/Flight convolution kernels from Jarron Leisenring, see detectors.apply_detector_ipc for details
+# NIRISS has different kernels provided by Kevin Volk (STScI), see detectors.apply_detector_ipc for details
+INSTRUMENT_IPC_DEFAULT_KERNEL_PARAMETERS = {
+    'MIRI': (0.033, 0.024, 0.013),          # Based on JWST-STScI-002925 by Mike Engesser
+}
+
+# How many detector pixels to mask out for the inner "hole" in the cruciform?
+# See Gaspar et al. 2021 for illustrative figures.
+# This is a rough approximation of a detector-position-dependent phenomenon
+MIRI_CRUCIFORM_INNER_RADIUS_PIX = 12