Merge pull request #41 from JarronL/develop

notebooks and tqdm in nb_func.py
JarronL · Nov 18, 2020 · 372540f · 372540f
2 parents 3d367cc + 2e94785
commit 372540f
Show file tree

Hide file tree

Showing 20 changed files with 2,230 additions and 54 deletions.
diff --git a/dev_utils/NIRCam_Darks/NIRCam_darks_485.ipynb b/dev_utils/NIRCam_Darks/NIRCam_darks_485.ipynb
@@ -585,7 +585,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,

diff --git a/dev_utils/NIRCam_Darks/NIRCam_darks_485_sim.ipynb b/dev_utils/NIRCam_Darks/NIRCam_darks_485_sim.ipynb
@@ -33,7 +33,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 3,
+   "execution_count": 4,
    "metadata": {},
    "outputs": [],
    "source": [

diff --git a/dev_utils/NIRCam_Flats/NIRCam_flats_485.ipynb b/dev_utils/NIRCam_Flats/NIRCam_flats_485.ipynb
diff --git a/dev_utils/WFE_coefficients.ipynb b/dev_utils/WFE_coefficients.ipynb
@@ -1,5 +1,12 @@
 {
  "cells": [
+  {
+   "cell_type": "markdown",
+   "metadata": {},
+   "source": [
+    "Notebook to develop the methods and algorithms that will produce the necessary modifications to PSF coefficients in order to handle changes in the WFE, either through OTE thermal/frill/IEC drifts, or field-dependent SI WFE "
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 1,
@@ -1619,7 +1626,7 @@
    "cell_type": "code",
    "execution_count": 245,
    "metadata": {
-    "collapsed": true
+    "scrolled": false
    },
    "outputs": [
     {
@@ -29196,7 +29203,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.9"
   },
   "mimetype": "text/x-python",
   "name": "python",

diff --git a/dev_utils/WFE_interp_NIRCam.ipynb b/dev_utils/WFE_interp_NIRCam.ipynb
@@ -506,7 +506,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,

diff --git a/dev_utils/WebbPSF_OTE_LM.ipynb b/dev_utils/WebbPSF_OTE_LM.ipynb
@@ -434,7 +434,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.6"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,

diff --git a/dev_utils/off_axis_psf.ipynb b/dev_utils/off_axis_psf.ipynb
@@ -2446,7 +2446,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.6.8"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/Exoplanet_Filter_Selection.ipynb b/notebooks/Exoplanet_Filter_Selection.ipynb
diff --git a/notebooks/GO/NRC_GO_YSO_RXJ1615.ipynb b/notebooks/GO/NRC_GO_YSO_RXJ1615.ipynb
diff --git a/notebooks/GO/YSOs/RXJ1615_SED.pdf b/notebooks/GO/YSOs/RXJ1615_SED.pdf
diff --git a/notebooks/GO/YSOs/RXJ1615_contrast.pdf b/notebooks/GO/YSOs/RXJ1615_contrast.pdf
diff --git a/notebooks/GO/YSOs/RXJ1615_images.pdf b/notebooks/GO/YSOs/RXJ1615_images.pdf
diff --git a/notebooks/GO/votables/RXJ1615.vot b/notebooks/GO/votables/RXJ1615.vot
diff --git a/notebooks/GTO/NRC_GTO_MDwarf_LW_Compare.ipynb b/notebooks/GTO/NRC_GTO_MDwarf_LW_Compare.ipynb
@@ -2345,7 +2345,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/GTO/NRC_GTO_MDwarf_LW_M430R.ipynb b/notebooks/GTO/NRC_GTO_MDwarf_LW_M430R.ipynb
@@ -3310,7 +3310,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/GTO/NRC_GTO_Transits.ipynb b/notebooks/GTO/NRC_GTO_Transits.ipynb
@@ -95,7 +95,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 9,
    "metadata": {},
    "outputs": [],
    "source": [
@@ -117,15 +117,15 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 11,
    "metadata": {},
    "outputs": [
     {
      "name": "stdout",
      "output_type": "stream",
      "text": [
-      "CPU times: user 1.73 s, sys: 763 ms, total: 2.49 s\n",
-      "Wall time: 2.5 s\n"
+      "CPU times: user 18.9 s, sys: 11.3 s, total: 30.3 s\n",
+      "Wall time: 30.9 s\n"
      ]
     }
    ],

diff --git a/notebooks/GTO/NRC_GTO_YSO_MWC758.ipynb b/notebooks/GTO/NRC_GTO_YSO_MWC758.ipynb
@@ -869,7 +869,7 @@
    "name": "python",
    "nbconvert_exporter": "python",
    "pygments_lexer": "ipython3",
-   "version": "3.7.1"
+   "version": "3.7.9"
   }
  },
  "nbformat": 4,

diff --git a/notebooks/GTO/NRC_GTO_YSO_PDS70.ipynb b/notebooks/GTO/NRC_GTO_YSO_PDS70.ipynb
diff --git a/notebooks/GTO/YSOs/PDS70_SED.pdf b/notebooks/GTO/YSOs/PDS70_SED.pdf
diff --git a/pynrc/nb_funcs.py b/pynrc/nb_funcs.py
@@ -16,6 +16,8 @@
 from .obs_nircam import model_to_hdulist, obs_hci
 #from .obs_nircam import plot_contrasts, plot_contrasts_mjup, planet_mags, plot_planet_patches
 
+from tqdm.auto import tqdm, trange
+
 import logging
 _log = logging.getLogger('nb_funcs')
 
@@ -373,7 +375,7 @@ def do_contrast(obs_dict, wfe_list, filt_keys, nsig=5, roll_angle=10, verbose=Fa
     return contrast_all
 
 
-def do_gen_hdus(obs_dict, filt_keys, wfe_ref_drift, wfe_roll_drift, verbose=True, **kwargs):
+def do_gen_hdus(obs_dict, filt_keys, wfe_ref_drift, wfe_roll_drift, verbose=False, **kwargs):
 
     """
     kwargs to pass to gen_roll_image() and their defaults:
@@ -392,7 +394,7 @@ def do_gen_hdus(obs_dict, filt_keys, wfe_ref_drift, wfe_roll_drift, verbose=True
     """
 
     hdulist_dict = {}
-    for key in filt_keys:
+    for key in tqdm(filt_keys):
         if verbose: print(key)
         obs = obs_dict[key]
         obs.wfe_ref_drift = wfe_ref_drift
@@ -1164,7 +1166,7 @@ def do_plot_contrasts(curves_ref, curves_roll, nsig, wfe_list, obs, age, age2=No
 def do_plot_contrasts2(key1, key2, curves_all, nsig, obs_dict, wfe_list, age, sat_dict=None,
                        label1='Curves1', label2='Curves2', xr=[0,10], yr=[24,8], 
                        yscale2='log', yr2=None, av_vals=[0,10], curves_all2=None, 
-                       c1=None, c2=None, linder_models=True, **kwargs):
+                       c1=None, c2=None, linder_models=True, planet_patches=True, **kwargs):
 
     fig, axes = plt.subplots(1,2, figsize=(14,5))
 
@@ -1194,10 +1196,10 @@ def do_plot_contrasts2(key1, key2, curves_all, nsig, obs_dict, wfe_list, age, sa
                        ax=ax, xr=xr, yr=yr, colors=c2)
 
     # Planet mass locations
-    plot_planet_patches(ax, obs_dict[key1], age=age, update_title=True, av_vals=av_vals, 
-                        linder=linder_models, **kwargs)
-
-
+    if planet_patches:
+        plot_planet_patches(ax, obs_dict[key1], age=age, update_title=True, av_vals=av_vals, 
+                            linder=linder_models, **kwargs)
+    ax.set_title('Flux Sensitivities')
 
     # Right plot (Converted to MJup/MEarth)
     ax = axes[1]
@@ -1236,14 +1238,22 @@ def do_plot_contrasts2(key1, key2, curves_all, nsig, obs_dict, wfe_list, age, sa
     h3 = handles[2*nwfe:]
     h1_t = [mpatches.Patch(color='none', label=label1)]
     h2_t = [mpatches.Patch(color='none', label=label2)]
-    h3_t = [mpatches.Patch(color='none', label='Models')]
-    if key2 is not None:
-        handles_new = h1_t + h1 + h2_t + h2 + h3_t + h3
-        ncol = 3
+    h3_t = [mpatches.Patch(color='none', label='{} ({})'.format(mod_str, obs_dict[key1].filter))]
+    if planet_patches:
+        if key2 is not None:
+            handles_new = h1_t + h1 + h2_t + h2 + h3_t + h3
+            ncol = 3
+        else:
+            h3 = handles[nwfe:]
+            handles_new = h1_t + h1 + h3_t + h3
+            ncol = 2
     else:
-        h3 = handles[nwfe:]
-        handles_new = h1_t + h1 + h3_t + h3
-        ncol = 2
+        if key2 is not None:
+            handles_new = h1_t + h1 + h2_t + h2
+            ncol = 2
+        else:
+            handles_new = h1_t + h1
+            ncol = 1        
     ax.legend(ncol=ncol, handles=handles_new, loc=1, fontsize=9)
 
     # Right legend