diff --git a/notebooks/ACS/acs_cte_forward_model/acs_cte_forward_model_example.ipynb b/notebooks/ACS/acs_cte_forward_model/acs_cte_forward_model_example.ipynb index b0c726f9b..68f6366d2 100644 --- a/notebooks/ACS/acs_cte_forward_model/acs_cte_forward_model_example.ipynb +++ b/notebooks/ACS/acs_cte_forward_model/acs_cte_forward_model_example.ipynb @@ -73,7 +73,7 @@ "\n", "`$ conda update hstcal`\n", "\n", - "`$ conda update acstools`" + "`$ conda update acstools` " ] }, { diff --git a/notebooks/ACS/acs_cte_forward_model/requirements.txt b/notebooks/ACS/acs_cte_forward_model/requirements.txt index c3b2442a5..5f2e62ee7 100644 --- a/notebooks/ACS/acs_cte_forward_model/requirements.txt +++ b/notebooks/ACS/acs_cte_forward_model/requirements.txt @@ -1,8 +1,8 @@ -acstools==3.5.0 -astropy==5.3.3 -astroquery==0.4.6 -matplotlib==3.7.0 -numpy==1.23.4 -photutils==1.6.0 -crds==11.17.7 -stsci.tools==4.1.0 +acstools>=3.7.2 +astropy>=5.3.3 +astroquery>=0.4.6 +matplotlib>=3.7.0 +numpy>=1.23.4 +photutils>=1.6.0 +crds>=11.17.7 +stsci.tools>=4.1.0 \ No newline at end of file diff --git a/notebooks/ACS/acs_findsat_mrt/acs_findsat_mrt_example.ipynb b/notebooks/ACS/acs_findsat_mrt/acs_findsat_mrt_example.ipynb index 72b54ae38..f4f47cb4f 100644 --- a/notebooks/ACS/acs_findsat_mrt/acs_findsat_mrt_example.ipynb +++ b/notebooks/ACS/acs_findsat_mrt/acs_findsat_mrt_example.ipynb @@ -187,7 +187,7 @@ "id": "bf3e40f2", "metadata": {}, "source": [ - "Below, we make a mask for bad pixels. We're ignoring cosmic rays here because routines to make them often partially (but not fully) mask trails. By default, any masked pixels are set to `NaN`." + "Below, we make a mask for bad pixels. We're ignoring cosmic rays here because routines to make them often partially (but not fully) mask trails. By default, any masked pixels are set to `NaN`. " ] }, { diff --git a/notebooks/ACS/acs_findsat_mrt/requirements.txt b/notebooks/ACS/acs_findsat_mrt/requirements.txt index c98b2aafe..d44ba30f2 100644 --- a/notebooks/ACS/acs_findsat_mrt/requirements.txt +++ b/notebooks/ACS/acs_findsat_mrt/requirements.txt @@ -1,7 +1,7 @@ -acstools>=3.7.0 +acstools>=3.7.2 astropy>=5.3.4 astroquery>=0.4.6 matplotlib>=3.8.1 numpy>=1.26.2 scikit-image>=0.22.0 -photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. +photutils>=1.12.0 \ No newline at end of file diff --git a/notebooks/ACS/acs_sbc_dark_analysis/acs_sbc_dark_analysis.ipynb b/notebooks/ACS/acs_sbc_dark_analysis/acs_sbc_dark_analysis.ipynb index 0a8a74333..b4c9b182d 100644 --- a/notebooks/ACS/acs_sbc_dark_analysis/acs_sbc_dark_analysis.ipynb +++ b/notebooks/ACS/acs_sbc_dark_analysis/acs_sbc_dark_analysis.ipynb @@ -51,7 +51,7 @@ "\n", "#### 4. [Perform Photometry](#_photometry)\n", "\n", - "* Subtract dark current from science images using aperture photometry" + "* Subtract dark current from science images using aperture photometry." ] }, { @@ -541,8 +541,7 @@ "drk_file = 'jcrx01iiq_raw.fits'\n", "new_file = 'dark1.fits'\n", "\n", - "os.system('cp {:} {:}'.format(flt_file, new_file))\n", - "\n", + "shutil.copy(flt_file, new_file)\n", "darkdat = fits.getdata(drk_file)\n", "exptime = fits.getval(drk_file, 'exptime', ext=0)\n", "\n", @@ -562,8 +561,7 @@ "drk_file = 'jcrx01iyq_raw.fits'\n", "new_file = 'dark2.fits'\n", "\n", - "os.system('cp {:} {:}'.format(flt_file, new_file))\n", - "\n", + "shutil.copy(flt_file, new_file)\n", "darkdat = fits.getdata(drk_file)\n", "exptime = fits.getval(drk_file, 'exptime', ext=0)\n", "\n", @@ -742,13 +740,6 @@ "

\n", "

" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { @@ -767,7 +758,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.4" + "version": "3.11.7" } }, "nbformat": 4, diff --git a/notebooks/ACS/acs_sbc_dark_analysis/requirements.txt b/notebooks/ACS/acs_sbc_dark_analysis/requirements.txt index a32d2b4a6..5907c0856 100644 --- a/notebooks/ACS/acs_sbc_dark_analysis/requirements.txt +++ b/notebooks/ACS/acs_sbc_dark_analysis/requirements.txt @@ -3,4 +3,4 @@ astroquery>=0.4.6 drizzlepac>=3.5.1 matplotlib>=3.7.0 numpy>=1.23.4 -photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. +photutils>=1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. diff --git a/notebooks/ACS/acs_subarrays/acs_subarrays.ipynb b/notebooks/ACS/acs_subarrays/acs_subarrays.ipynb index 314743d79..576ca4caf 100644 --- a/notebooks/ACS/acs_subarrays/acs_subarrays.ipynb +++ b/notebooks/ACS/acs_subarrays/acs_subarrays.ipynb @@ -80,14 +80,15 @@ "from astropy.table import Table\n", "\n", "from stwcs import updatewcs\n", - "from acstools import (acs_destripe_plus, utils_calib)" + "from acstools import (acs_destripe_plus, utils_calib)\n", + "from IPython.display import clear_output" ] }, { "cell_type": "markdown", "metadata": {}, "source": [ - "Here we set environment variables for later use with the Calibration Reference Data System (CRDS)." + "Here we set environment variables for later use with the Calibration Reference Data System (CRDS). " ] }, { @@ -311,8 +312,8 @@ "metadata": {}, "outputs": [], "source": [ - "cmd_input = 'crds bestrefs --files {:} --sync-references=1 --update-bestrefs'.format(sbc_fits)\n", - "os.system(cmd_input)" + "!crds bestrefs --files {sbc_fits} --sync-references=1 --update-bestrefs\n", + "clear_output()" ] }, { @@ -373,8 +374,8 @@ "outputs": [], "source": [ "sbc_fits = 'j92sa0w6q_raw.fits'\n", - "cmd_input = 'crds bestrefs --files {:} --sync-references=1 --update-bestrefs'.format(sbc_fits)\n", - "os.system(cmd_input)" + "!crds bestrefs --files {sbc_fits} --sync-references=1 --update-bestrefs\n", + "clear_output()" ] }, { @@ -741,13 +742,6 @@ "

\n", "

" ] - }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] } ], "metadata": { @@ -766,7 +760,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.4" + "version": "3.11.7" } }, "nbformat": 4, diff --git a/notebooks/ACS/acs_subarrays/requirements.txt b/notebooks/ACS/acs_subarrays/requirements.txt index 437404baa..3aa580cf8 100644 --- a/notebooks/ACS/acs_subarrays/requirements.txt +++ b/notebooks/ACS/acs_subarrays/requirements.txt @@ -1,4 +1,4 @@ -acstools>=3.5.0 +acstools>=3.7.2 astropy>=5.3.3 astroquery>=0.4.6 stwcs>=1.7.2