From 1a57f26aabadfafc697a109d9587a16af747392c Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 09:45:14 -0400 Subject: [PATCH 01/12] Update dependencies of align mosaic --- notebooks/DrizzlePac/align_mosaics/requirements.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/notebooks/DrizzlePac/align_mosaics/requirements.txt b/notebooks/DrizzlePac/align_mosaics/requirements.txt index d2008a4d9..fd4bf648b 100644 --- a/notebooks/DrizzlePac/align_mosaics/requirements.txt +++ b/notebooks/DrizzlePac/align_mosaics/requirements.txt @@ -1,7 +1,7 @@ -astropy==5.3.3 -astroquery==0.4.6 -drizzlepac==3.5.1 -ipython==8.11.0 -matplotlib==3.7.0 -numpy==1.23.4 +astropy>=5.3.3 +astroquery>=0.4.6 +drizzlepac>=3.5.1 +ipython>=8.11.0 +matplotlib>=3.7.0 +numpy>=1.23.4 photutils==1.12.0 From 1fc5295880b008aed1590dff731d6bbdde0b55fd Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 09:45:32 -0400 Subject: [PATCH 02/12] Remove deprecated methods --- notebooks/DrizzlePac/align_mosaics/align_mosaics.ipynb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/notebooks/DrizzlePac/align_mosaics/align_mosaics.ipynb b/notebooks/DrizzlePac/align_mosaics/align_mosaics.ipynb index 97aa09cfd..12465cab6 100755 --- a/notebooks/DrizzlePac/align_mosaics/align_mosaics.ipynb +++ b/notebooks/DrizzlePac/align_mosaics/align_mosaics.ipynb @@ -426,7 +426,7 @@ " col_dict[f'{kw}pix'].append(val)\n", " \n", "mast_ir_wcs = Table(col_dict)\n", - "mast_ir_wcs.show_in_notebook()" + "mast_ir_wcs" ] }, { @@ -465,7 +465,7 @@ " col_dict_uvis[f'{kw}pix'].append(val)\n", " \n", "mast_uvis_wcs = Table(col_dict_uvis)\n", - "mast_uvis_wcs.show_in_notebook()" + "mast_uvis_wcs" ] }, { @@ -1200,7 +1200,7 @@ "## About this Notebook \n", "\n", " Created: 14 Dec 2018; J. Mack\n", - " Updated: 31 May 2024; J. Mack & B. Kuhn\n", + " Updated: 02 Aug 2024; J. Mack & B. Kuhn\n", "\n", "**Source:** GitHub [spacetelescope/hst_notebooks](https://github.com/spacetelescope/hst_notebooks)\n", "\n", @@ -1244,7 +1244,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" } }, "nbformat": 4, From dbecefd73998c7c1b174b04fbf6c23482102c55d Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 10:03:35 -0400 Subject: [PATCH 03/12] Update align_multiple_visits nb dependency pinning --- .../align_multiple_visits.ipynb | 8 ++++---- .../align_multiple_visits/requirements.txt | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb b/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb index 22e1d7734..8bc5b6890 100644 --- a/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb +++ b/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb @@ -22,7 +22,7 @@ "\n", "This notebook demonstrates how to use `TweakReg` and `AstroDrizzle` tasks to align and combine images. While this example focuses on ACS/WFC data, the procedure can be almost identically applied to WFC3/UVIS images. This notebook is based on [a prior example](http://documents.stsci.edu/hst/HST_overview/documents/DrizzlePac/ch75.html) from the 2012 [DrizzlePac Handbook](http://documents.stsci.edu/hst/HST_overview/documents/DrizzlePac/toc.html), but has been updated for compatibility with the STScI AstroConda software distribution. There is a good deal of explanatory text in this notebook, and users new to DrizzlePac are encouraged to start with this tutorial. Additional DrizzlePac software documentation is available at [the readthedocs webpage](https://drizzlepac.readthedocs.io).\n", "\n", - "Before running the notebook, you will need to install the `astroquery` package, which is used to retrieve the data from the MAST archive and the `ccdproc` package which is used to query the image headers. \n", + "Before running the notebook, you will need to install the `astroquery` package, which is used to retrieve the data from the MAST archive and the `ccdproc` package which is used to query the image headers. \n", "\n", "Summary of steps:\n", "\n", @@ -620,7 +620,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3", + "display_name": "Python 3 (ipykernel)", "language": "python", "name": "python3" }, @@ -634,9 +634,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.6.6" + "version": "3.12.4" } }, "nbformat": 4, - "nbformat_minor": 2 + "nbformat_minor": 4 } diff --git a/notebooks/DrizzlePac/align_multiple_visits/requirements.txt b/notebooks/DrizzlePac/align_multiple_visits/requirements.txt index 9927ef4bf..63091b33e 100644 --- a/notebooks/DrizzlePac/align_multiple_visits/requirements.txt +++ b/notebooks/DrizzlePac/align_multiple_visits/requirements.txt @@ -1,6 +1,6 @@ -astropy==5.3.3 -astroquery==0.4.6 -drizzlepac==3.5.1 -ipython==8.11.0 -matplotlib==3.7.0 -photutils==1.12.0 +astropy>=5.3.3 +astroquery>=0.4.6 +drizzlepac>=3.5.1 +ipython>=8.11.0 +matplotlib>=3.7.0 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. From 171201696f1d1cac851707b4e611790e0c3a47c8 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 10:19:56 -0400 Subject: [PATCH 04/12] Update dependencies of align sparse_fields --- .../align_sparse_fields.ipynb | 4 ++-- .../align_sparse_fields/requirements.txt | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/notebooks/DrizzlePac/align_sparse_fields/align_sparse_fields.ipynb b/notebooks/DrizzlePac/align_sparse_fields/align_sparse_fields.ipynb index c4ca7d139..d1a75cb74 100755 --- a/notebooks/DrizzlePac/align_sparse_fields/align_sparse_fields.ipynb +++ b/notebooks/DrizzlePac/align_sparse_fields/align_sparse_fields.ipynb @@ -42,7 +42,7 @@ "The following Python packages are required to run the Jupyter Notebook:\n", " - [**collections**](https://docs.python.org/3/library/collections.html) - include specialized datatypes\n", " - [**glob**](https://docs.python.org/3/library/glob.html) - gather lists of filenames\n", - " - [**os**](https://docs.python.org/3/library/os.html) - change and make directories\n", + " - [**os**](https://docs.python.org/3/library/os.html) - change and make directories \n", " - [**shutil**](https://docs.python.org/3/library/shutil.html) - perform high-level file operations\n", " - [**iPython**](https://ipython.readthedocs.io/en/stable/) - interactive handling\n", " - [**matplotlib**](https://matplotlib.org) - create graphics\n", @@ -1013,7 +1013,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/notebooks/DrizzlePac/align_sparse_fields/requirements.txt b/notebooks/DrizzlePac/align_sparse_fields/requirements.txt index d35b1acb6..9ba08c45c 100644 --- a/notebooks/DrizzlePac/align_sparse_fields/requirements.txt +++ b/notebooks/DrizzlePac/align_sparse_fields/requirements.txt @@ -1,9 +1,9 @@ -astropy==6.0.0 -astroquery==0.4.6 -crds==11.17.15 -drizzlepac==3.6.2 -ipython==8.21.0 -matplotlib==3.8.2 -numpy==1.26.3 -photutils==1.12.0 -jupyter==1.0.0 \ No newline at end of file +astropy>=6.0.0 +astroquery>=0.4.6 +crds>=11.17.15 +drizzlepac>=3.6.2 +ipython>=8.21.0 +matplotlib>=3.8.2 +numpy>=1.26.3 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. +jupyter>=1.0.0 \ No newline at end of file From 9a46b0925d037beaed7fb0532573f8b0e1550e6a Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 10:49:14 -0400 Subject: [PATCH 05/12] Updates to align_to_catalogs dependency pinnings --- .../align_to_catalogs/align_to_catalogs.ipynb | 6 +++--- .../align_to_catalogs/requirements.txt | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/notebooks/DrizzlePac/align_to_catalogs/align_to_catalogs.ipynb b/notebooks/DrizzlePac/align_to_catalogs/align_to_catalogs.ipynb index 2c07826ee..e955261ae 100644 --- a/notebooks/DrizzlePac/align_to_catalogs/align_to_catalogs.ipynb +++ b/notebooks/DrizzlePac/align_to_catalogs/align_to_catalogs.ipynb @@ -49,7 +49,7 @@ "source": [ "\n", "## Introduction\n", - "The alignment of HST exposures is a critical step in image stacking or combination performed with software such as `AstroDrizzle`. Generally, a *relative* alignment is performed to align one or multiple images to another image that is designated as the reference image. The reference image is generally the deepest exposure and/or that covering the largest area of all the exposures. This process aligns the images to each other, but the pointing error of the observatory can still cause the images to have incorrect *absolute* astrometry. When absolute astrometry is desired, the images can be aligned to an external catalog with an absolute world coordinate system (WCS). In this example, we will provide a workflow to query catalogs such as SDSS and Gaia using the astroquery package, and then align the images to that catalog using TweakReg.\n", + "The alignment of HST exposures is a critical step in image stacking or combination performed with software such as `AstroDrizzle`. Generally, a *relative* alignment is performed to align one or multiple images to another image that is designated as the reference image. The reference image is generally the deepest exposure and/or that covering the largest area of all the exposures. This process aligns the images to each other, but the pointing error of the observatory can still cause the images to have incorrect *absolute* astrometry. When absolute astrometry is desired, the images can be aligned to an external catalog with an absolute world coordinate system (WCS). In this example, we will provide a workflow to query catalogs such as SDSS and Gaia using the astroquery package, and then align the images to that catalog using TweakReg. \n", "\n", "The workflow in this notebook for aligning images to [Gaia](https://www.cosmos.esa.int/web/gaia/home) is based on [WFC3 ISR 2017-19: Aligning HST Images to Gaia: a Faster Mosaicking Workflow](https://www.stsci.edu/files/live/sites/www/files/home/hst/instrumentation/wfc3/documentation/instrument-science-reports-isrs/_documents/2017/WFC3-2017-19.pdf) and contains a subset of the information and code found in [this repository](https://github.com/spacetelescope/gaia_alignment). For more information, see the notebook in that repository titled [Gaia_alignment.ipynb](https://github.com/spacetelescope/gaia_alignment/blob/master/Gaia_alignment.ipynb).\n", "\n", @@ -318,7 +318,7 @@ "outputs": [], "source": [ "coord = SkyCoord(ra=RA, dec=Dec, unit=(u.deg, u.deg))\n", - "radius = Quantity(5., u.arcmin)" + "radius = Quantity(3., u.arcmin)" ] }, { @@ -965,7 +965,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/notebooks/DrizzlePac/align_to_catalogs/requirements.txt b/notebooks/DrizzlePac/align_to_catalogs/requirements.txt index d35b1acb6..03e95e8d2 100644 --- a/notebooks/DrizzlePac/align_to_catalogs/requirements.txt +++ b/notebooks/DrizzlePac/align_to_catalogs/requirements.txt @@ -1,9 +1,9 @@ -astropy==6.0.0 -astroquery==0.4.6 -crds==11.17.15 -drizzlepac==3.6.2 -ipython==8.21.0 -matplotlib==3.8.2 -numpy==1.26.3 -photutils==1.12.0 -jupyter==1.0.0 \ No newline at end of file +astropy>=6.0.0 +astroquery==0.4.6 # SDSS.query_region() method methods changed, causing errors with later releases. The notebook needs to be updated. +crds>=11.17.15 +drizzlepac>=3.6.2 +ipython>=8.21.0 +matplotlib>=3.8.2 +numpy>=1.26.3 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. +jupyter>=1.0.0 \ No newline at end of file From d83576aca5adc57c84701c21d0cec5154efb9232 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 10:59:22 -0400 Subject: [PATCH 06/12] Update wfc2 notebook dependency pinnings --- .../drizzle_wfpc2/drizzle_wfpc2.ipynb | 11 ++------- .../DrizzlePac/drizzle_wfpc2/requirements.txt | 24 +++++++++---------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/notebooks/DrizzlePac/drizzle_wfpc2/drizzle_wfpc2.ipynb b/notebooks/DrizzlePac/drizzle_wfpc2/drizzle_wfpc2.ipynb index 53b27017c..0b18ea1fd 100644 --- a/notebooks/DrizzlePac/drizzle_wfpc2/drizzle_wfpc2.ipynb +++ b/notebooks/DrizzlePac/drizzle_wfpc2/drizzle_wfpc2.ipynb @@ -83,7 +83,7 @@ "source": [ "## 1. Download the Data \n", "\n", - "This example uses WFPC2 observations of Messier 2 in the F814W filter. The data come from GO proposal [11100](http://www.stsci.edu/cgi-bin/get-proposal-info?id=11100&observatory=HST) _\"Two new 'bullets' for MOND: revealing the properties of dark matter in massive merging clusters\"_. Four images were acquired using a 4-pt dither box pattern, followed by two images offset with a dither-line pattern. \n", + "This example uses WFPC2 observations of Messier 2 in the F814W filter. The data come from GO proposal [11100](http://www.stsci.edu/cgi-bin/get-proposal-info?id=11100&observatory=HST) _\"Two new 'bullets' for MOND: revealing the properties of dark matter in massive merging clusters\"_. Four images were acquired using a 4-pt dither box pattern, followed by two images offset with a dither-line pattern. \n", "\n", "The data are downloaded using the `astroquery` API to access the [MAST](http://archive.stsci.edu) archive. The `astroquery.mast` [documentation](http://astroquery.readthedocs.io/en/latest/mast/mast.html) has more examples for how to find and download data from MAST." ] @@ -129,13 +129,6 @@ "First we download the reference files from the CRDS website. See the initialization notebook in this repository for more information. " ] }, - { - "cell_type": "code", - "execution_count": null, - "metadata": {}, - "outputs": [], - "source": [] - }, { "cell_type": "code", "execution_count": null, @@ -537,7 +530,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" }, "varInspector": { "cols": { diff --git a/notebooks/DrizzlePac/drizzle_wfpc2/requirements.txt b/notebooks/DrizzlePac/drizzle_wfpc2/requirements.txt index de2e4e914..a14bb9a3e 100644 --- a/notebooks/DrizzlePac/drizzle_wfpc2/requirements.txt +++ b/notebooks/DrizzlePac/drizzle_wfpc2/requirements.txt @@ -1,13 +1,13 @@ -astropy==5.3.3 -astroquery==0.4.6 -drizzlepac==3.5.1 -matplotlib==3.7.0 -numpy==1.23.4 -photutils==1.12.0 -stsci.image==2.3.5 -stsci.imagestats==1.6.3 -stsci.skypac==1.0.9 -stsci.stimage==0.2.6 -stsci.tools==4.0.1 -stwcs==1.7.2 +astropy>=5.3.3 +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. +stsci.image>=2.3.5 +stsci.imagestats>=1.6.3 +stsci.skypac>=1.0.9 +stsci.stimage>=0.2.6 +stsci.tools>=4.0.1 +stwcs>=1.7.2 crds \ No newline at end of file From 1ce794f67d9b54dbdc8d11b899a7a7bcd86725f7 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 11:22:32 -0400 Subject: [PATCH 07/12] Update the dependencies of mask_satellite nb --- .../mask_satellite/mask_satellite.ipynb | 4 ++-- .../mask_satellite/requirements.txt | 20 +++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/notebooks/DrizzlePac/mask_satellite/mask_satellite.ipynb b/notebooks/DrizzlePac/mask_satellite/mask_satellite.ipynb index b99981f36..bb0209d7f 100644 --- a/notebooks/DrizzlePac/mask_satellite/mask_satellite.ipynb +++ b/notebooks/DrizzlePac/mask_satellite/mask_satellite.ipynb @@ -53,7 +53,7 @@ "## Introduction \n", "[Table of Contents](#toc)\n", "\n", - "Even though Hubble has a small field of view, satellites are commonly captured in images. The cosmic ray rejection algorithm in Astrodrizzle is not well suited to eliminate satellite trails, and the affected adjacent pixels that make up their wings leave ugly blemishes in stacked images. \n", + "Even though Hubble has a small field of view, satellites are commonly captured in images. The cosmic ray rejection algorithm in Astrodrizzle is not well suited to eliminate satellite trails, and the affected adjacent pixels that make up their wings leave ugly blemishes in stacked images. \n", "\n", "To fix this problem, the pixels around satellite trails need to be marked as bad in the affected images. There are several ways to accomplish this goal. The ACS Team developed multiple algorithms to automatically detect and mask satellite trails. The newest is a module called `findsat_mrt` and is decribed in [ISR ACS 2022-08](https://www.stsci.edu/files/live/sites/www/files/home/hst/instrumentation/acs/documentation/instrument-science-reports-isrs/_documents/isr2208.pdf). The 'readthedocs' page can be found here: [MRT-based Satellite Trail Detection](https://acstools.readthedocs.io/en/latest/findsat_mrt.html). The second module is called `satdet` and is described in [ISR ACS 2016-01](http://www.stsci.edu/hst/acs/documents/isrs/isr1601.pdf). The 'readthedocs' page for the software can be found here: [Satellite Trails Detection](https://acstools.readthedocs.io/en/stable/satdet.html). `findsat_mrt` has the benefit of significantly improved sensitivity over `satdet` but it is more computationally demanding. \n", "\n", @@ -1162,7 +1162,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/notebooks/DrizzlePac/mask_satellite/requirements.txt b/notebooks/DrizzlePac/mask_satellite/requirements.txt index e7221a8e5..a68c33bab 100644 --- a/notebooks/DrizzlePac/mask_satellite/requirements.txt +++ b/notebooks/DrizzlePac/mask_satellite/requirements.txt @@ -1,11 +1,11 @@ -regions==0.7 -astropy==6.0.0 -astroquery==0.4.6 -crds==11.17.15 -drizzlepac==3.6.2 -ipython==8.21.0 -matplotlib==3.8.2 +regions>=0.7 +astropy>=6.0.0 +astroquery>=0.4.6 +crds>=11.17.15 +drizzlepac>=3.6.2 +ipython>=8.21.0 +matplotlib>=3.8.2 photutils==1.12.0 -jupyter==1.0.0 -acstools==3.7.1 -scikit-image==0.20.0 +jupyter>=1.0.0 +acstools>=3.7.1 +scikit-image>=0.20.0 From c041a1b68869e5b7be65bb674db1e061c46c4c5e Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 11:34:55 -0400 Subject: [PATCH 08/12] Update the requirements.txt --- .../optimize_image_sampling.ipynb | 4 ++-- .../optimize_image_sampling/requirements.txt | 18 +++++++++--------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/notebooks/DrizzlePac/optimize_image_sampling/optimize_image_sampling.ipynb b/notebooks/DrizzlePac/optimize_image_sampling/optimize_image_sampling.ipynb index 31ee49783..ff914a47c 100644 --- a/notebooks/DrizzlePac/optimize_image_sampling/optimize_image_sampling.ipynb +++ b/notebooks/DrizzlePac/optimize_image_sampling/optimize_image_sampling.ipynb @@ -49,7 +49,7 @@ "\n", "This example was written to help users better understand the subtleties in improving image sampling for dithered data. One of the powers of the *drizzling* algorithm is that, given properly dithered images, it can restore much of the information lost due to undersampled images ([Fruchter and Hook, 2002](http://iopscience.iop.org/article/10.1086/338393/pdf)). \n", "\n", - "This work is based on [ISR ACS 2015-01](https://www.stsci.edu/files/live/sites/www/files/home/hst/instrumentation/acs/documentation/instrument-science-reports-isrs/_documents/isr1501.pdf), which contains a more detailed discussion than presented here.\n", + "This work is based on [ISR ACS 2015-01](https://www.stsci.edu/files/live/sites/www/files/home/hst/instrumentation/acs/documentation/instrument-science-reports-isrs/_documents/isr1501.pdf), which contains a more detailed discussion than presented here. \n", "\n", "In practice, this requires the use of `Astrodrizzle` task within the `Drizzlepac` package. This example will:\n", "\n", @@ -735,7 +735,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/notebooks/DrizzlePac/optimize_image_sampling/requirements.txt b/notebooks/DrizzlePac/optimize_image_sampling/requirements.txt index 3a39dd563..78b05a2dc 100644 --- a/notebooks/DrizzlePac/optimize_image_sampling/requirements.txt +++ b/notebooks/DrizzlePac/optimize_image_sampling/requirements.txt @@ -1,9 +1,9 @@ -astropy==6.0.1 -astroquery==0.4.7 -crds==11.17.20 -drizzlepac==3.6.2 -ipython==8.22.2 -jupyter==1.0.0 -matplotlib==3.8.4 -numpy==1.26.4 -photutils==1.12.0 +astropy>=6.0.1 +astroquery>=0.4.7 +crds>=11.17.20 +drizzlepac>=3.6.2 +ipython>=8.22.2 +jupyter>=1.0.0 +matplotlib>=3.8.4 +numpy>=1.26.4 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. From 99ffc16291b4155f3c5820cf5871cd1541c498b7 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 11:59:35 -0400 Subject: [PATCH 09/12] Update tweakreg nb dependencies --- .../use_ds9_regions_in_tweakreg/requirements.txt | 14 +++++++------- .../use_ds9_regions_in_tweakreg.ipynb | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/requirements.txt b/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/requirements.txt index a7c57f23b..4cd20c35d 100644 --- a/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/requirements.txt +++ b/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/requirements.txt @@ -1,7 +1,7 @@ -astropy==6.0.1 -astroquery==0.4.7 -drizzlepac==3.6.2 -matplotlib==3.8.4 -numpy==1.26.4 -photutils==1.12.0 -regions==0.9 +astropy>=6.0.1 +astroquery>=0.4.7 +drizzlepac>=3.6.2 +matplotlib>=3.8.4 +numpy>=1.26.4 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. +regions>=0.9 diff --git a/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/use_ds9_regions_in_tweakreg.ipynb b/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/use_ds9_regions_in_tweakreg.ipynb index e7014f6db..87611824a 100644 --- a/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/use_ds9_regions_in_tweakreg.ipynb +++ b/notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/use_ds9_regions_in_tweakreg.ipynb @@ -676,7 +676,7 @@ "cell_type": "markdown", "metadata": {}, "source": [ - "Once you are happy with the sources being used for alignment, `TweakReg` may be used to align the two HST images `jcdua3f4q_flc.fits` and `jcdua3f8q_flc.fits` to one another or to an external reference catalog. For more information, see the alignment notebooks in this repository. " + "Once you are happy with the sources being used for alignment, `TweakReg` may be used to align the two HST images `jcdua3f4q_flc.fits` and `jcdua3f8q_flc.fits` to one another or to an external reference catalog. For more information, see the alignment notebooks in this repository. " ] }, { @@ -738,7 +738,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" } }, "nbformat": 4, From b227392afccafd045be5a740c926efe9095ba7d2 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 12:06:43 -0400 Subject: [PATCH 10/12] Update astrometry solutions nb dependencies --- .../requirements.txt | 18 +++++++++--------- .../using_updated_astrometry_solutions.ipynb | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/notebooks/DrizzlePac/using_updated_astrometry_solutions/requirements.txt b/notebooks/DrizzlePac/using_updated_astrometry_solutions/requirements.txt index d35b1acb6..9ba08c45c 100644 --- a/notebooks/DrizzlePac/using_updated_astrometry_solutions/requirements.txt +++ b/notebooks/DrizzlePac/using_updated_astrometry_solutions/requirements.txt @@ -1,9 +1,9 @@ -astropy==6.0.0 -astroquery==0.4.6 -crds==11.17.15 -drizzlepac==3.6.2 -ipython==8.21.0 -matplotlib==3.8.2 -numpy==1.26.3 -photutils==1.12.0 -jupyter==1.0.0 \ No newline at end of file +astropy>=6.0.0 +astroquery>=0.4.6 +crds>=11.17.15 +drizzlepac>=3.6.2 +ipython>=8.21.0 +matplotlib>=3.8.2 +numpy>=1.26.3 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. +jupyter>=1.0.0 \ No newline at end of file diff --git a/notebooks/DrizzlePac/using_updated_astrometry_solutions/using_updated_astrometry_solutions.ipynb b/notebooks/DrizzlePac/using_updated_astrometry_solutions/using_updated_astrometry_solutions.ipynb index d41d74151..e8c3ad1e7 100644 --- a/notebooks/DrizzlePac/using_updated_astrometry_solutions/using_updated_astrometry_solutions.ipynb +++ b/notebooks/DrizzlePac/using_updated_astrometry_solutions/using_updated_astrometry_solutions.ipynb @@ -43,7 +43,7 @@ "## Introduction\n", "\n", "\n", - "Starting in December 2019, improved astrometric solutions for ACS and WFC3 images are available in the World Coordinate System (WCS) of the exposure file (`flt.fits` and `flc.fits`) FITS headers, with alternate WCS solutions appended as additional headerlet extensions. These solutions are also available as separate [headerlet](https://stwcs.readthedocs.io/en/latest/headerlet.html) FITS files which may be downloaded and applied to the FITS images.
\n", + "Starting in December 2019, improved astrometric solutions for ACS and WFC3 images are available in the World Coordinate System (WCS) of the exposure file (`flt.fits` and `flc.fits`) FITS headers, with alternate WCS solutions appended as additional headerlet extensions. These solutions are also available as separate [headerlet](https://stwcs.readthedocs.io/en/latest/headerlet.html) FITS files which may be downloaded and applied to the FITS images.
\n", "
\n", "This notebook shows how to examine different WCS solutions contained in the FITS images and how to improve the relative alignment of exposures in the F225W and F336W filters which were taken in the same visit but which have different active WCS solutions.\n", "\n", @@ -981,7 +981,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.7" + "version": "3.12.4" } }, "nbformat": 4, From bc3c1d7bfa6a8d33c29dac6e69b40bd894a2acc7 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 12:08:09 -0400 Subject: [PATCH 11/12] Describe why pin photutils --- notebooks/DrizzlePac/align_mosaics/requirements.txt | 2 +- notebooks/DrizzlePac/mask_satellite/requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/notebooks/DrizzlePac/align_mosaics/requirements.txt b/notebooks/DrizzlePac/align_mosaics/requirements.txt index fd4bf648b..1d4d0bdc2 100644 --- a/notebooks/DrizzlePac/align_mosaics/requirements.txt +++ b/notebooks/DrizzlePac/align_mosaics/requirements.txt @@ -4,4 +4,4 @@ drizzlepac>=3.5.1 ipython>=8.11.0 matplotlib>=3.7.0 numpy>=1.23.4 -photutils==1.12.0 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. diff --git a/notebooks/DrizzlePac/mask_satellite/requirements.txt b/notebooks/DrizzlePac/mask_satellite/requirements.txt index a68c33bab..e1fa9a44f 100644 --- a/notebooks/DrizzlePac/mask_satellite/requirements.txt +++ b/notebooks/DrizzlePac/mask_satellite/requirements.txt @@ -5,7 +5,7 @@ crds>=11.17.15 drizzlepac>=3.6.2 ipython>=8.21.0 matplotlib>=3.8.2 -photutils==1.12.0 +photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. jupyter>=1.0.0 acstools>=3.7.1 scikit-image>=0.20.0 From 44d17e9013b9977f765c92d22654d3523cd2b3f0 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Fri, 2 Aug 2024 12:13:27 -0400 Subject: [PATCH 12/12] Revert align_multiple_visits as it has another PR --- .../align_multiple_visits.ipynb | 8 ++++---- .../align_multiple_visits/requirements.txt | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb b/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb index 8bc5b6890..22e1d7734 100644 --- a/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb +++ b/notebooks/DrizzlePac/align_multiple_visits/align_multiple_visits.ipynb @@ -22,7 +22,7 @@ "\n", "This notebook demonstrates how to use `TweakReg` and `AstroDrizzle` tasks to align and combine images. While this example focuses on ACS/WFC data, the procedure can be almost identically applied to WFC3/UVIS images. This notebook is based on [a prior example](http://documents.stsci.edu/hst/HST_overview/documents/DrizzlePac/ch75.html) from the 2012 [DrizzlePac Handbook](http://documents.stsci.edu/hst/HST_overview/documents/DrizzlePac/toc.html), but has been updated for compatibility with the STScI AstroConda software distribution. There is a good deal of explanatory text in this notebook, and users new to DrizzlePac are encouraged to start with this tutorial. Additional DrizzlePac software documentation is available at [the readthedocs webpage](https://drizzlepac.readthedocs.io).\n", "\n", - "Before running the notebook, you will need to install the `astroquery` package, which is used to retrieve the data from the MAST archive and the `ccdproc` package which is used to query the image headers. \n", + "Before running the notebook, you will need to install the `astroquery` package, which is used to retrieve the data from the MAST archive and the `ccdproc` package which is used to query the image headers. \n", "\n", "Summary of steps:\n", "\n", @@ -620,7 +620,7 @@ ], "metadata": { "kernelspec": { - "display_name": "Python 3 (ipykernel)", + "display_name": "Python 3", "language": "python", "name": "python3" }, @@ -634,9 +634,9 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.12.4" + "version": "3.6.6" } }, "nbformat": 4, - "nbformat_minor": 4 + "nbformat_minor": 2 } diff --git a/notebooks/DrizzlePac/align_multiple_visits/requirements.txt b/notebooks/DrizzlePac/align_multiple_visits/requirements.txt index 63091b33e..9927ef4bf 100644 --- a/notebooks/DrizzlePac/align_multiple_visits/requirements.txt +++ b/notebooks/DrizzlePac/align_multiple_visits/requirements.txt @@ -1,6 +1,6 @@ -astropy>=5.3.3 -astroquery>=0.4.6 -drizzlepac>=3.5.1 -ipython>=8.11.0 -matplotlib>=3.7.0 -photutils==1.12.0 # The drizzlepac needs deprecated methods such as DAOGroup. +astropy==5.3.3 +astroquery==0.4.6 +drizzlepac==3.5.1 +ipython==8.11.0 +matplotlib==3.7.0 +photutils==1.12.0