From 3788ab89e6c57a91ae3c9cde90d0f6f232b58563 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Tue, 13 Aug 2024 12:11:23 -0400 Subject: [PATCH 1/5] Update calstis_2d_ccd notebook dependencies --- notebooks/STIS/calstis/calstis_2d_ccd.ipynb | 4 ++-- notebooks/STIS/calstis/pre-requirements.sh | 2 +- notebooks/STIS/calstis/requirements.txt | 8 ++++---- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/notebooks/STIS/calstis/calstis_2d_ccd.ipynb b/notebooks/STIS/calstis/calstis_2d_ccd.ipynb index 183c42e18..74a1aef61 100644 --- a/notebooks/STIS/calstis/calstis_2d_ccd.ipynb +++ b/notebooks/STIS/calstis/calstis_2d_ccd.ipynb @@ -28,7 +28,7 @@ "## 0 Introduction\n", "The STIS calibration pipeline, calstis, performs the calibration of STIS science data. Calstis consists of a series of individual modules that performs initial 2D image reduction, contemporaneous wavecal processing, spectroscopic calibration, extraction, rectification, and summation of images. In this notebook, we will go through the data flow through calstis of 2D CCD data reduction common to imaging and spectroscopy (for creating the `flt` data product from a `raw` file). This notebook also shows how negative count values are produced in the pipeline.\n", "\n", - "Some calibration process may require the application of calibration reference files. The names of which are found in the fits file header. To download reference files and configure reference environment variables, follow the steps in [HST Calibration Reference Data System (CRDS)](https://hst-crds.stsci.edu/docs/cmdline_bestrefs/) for personal or offsite use.\n", + "Some calibration process may require the application of calibration reference files. The names of which are found in the fits file header. To download reference files and configure reference environment variables, follow the steps in [HST Calibration Reference Data System (CRDS)](https://hst-crds.stsci.edu/docs/cmdline_bestrefs/) for personal or offsite use. \n", "\n", "For more information about calstis see:\n", "- [STIS Calibration in the STIS Data Handbook](https://hst-docs.stsci.edu/stisdhb/chapter-3-stis-calibration)\n", @@ -705,7 +705,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.12" + "version": "3.12.4" }, "toc": { "base_numbering": "0", diff --git a/notebooks/STIS/calstis/pre-requirements.sh b/notebooks/STIS/calstis/pre-requirements.sh index 4211058bc..cf220e231 100755 --- a/notebooks/STIS/calstis/pre-requirements.sh +++ b/notebooks/STIS/calstis/pre-requirements.sh @@ -1 +1 @@ -conda install -y -c conda-forge hstcal==2.7.4 \ No newline at end of file +conda install -y -c conda-forge hstcal \ No newline at end of file diff --git a/notebooks/STIS/calstis/requirements.txt b/notebooks/STIS/calstis/requirements.txt index 807104853..495ac2746 100644 --- a/notebooks/STIS/calstis/requirements.txt +++ b/notebooks/STIS/calstis/requirements.txt @@ -1,5 +1,5 @@ -astropy==5.3.3 -astroquery==0.4.6 -matplotlib==3.7.0 -stistools==1.4.4 +astropy>=5.3.3 +astroquery>=0.4.6 +matplotlib>=3.7.0 +stistools>=1.4.4 crds>=11.17 From d2f6c348cfd382ff87690520632da2799884d554 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Tue, 13 Aug 2024 12:43:06 -0400 Subject: [PATCH 2/5] Update Coronography_visalization nb dependencies --- .../CoronagraphyViz/STIS_Coronagraphy_Visualization_v2.ipynb | 4 ++-- notebooks/STIS/CoronagraphyViz/requirements.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/notebooks/STIS/CoronagraphyViz/STIS_Coronagraphy_Visualization_v2.ipynb b/notebooks/STIS/CoronagraphyViz/STIS_Coronagraphy_Visualization_v2.ipynb index 11178bc4d..2d82d9c74 100644 --- a/notebooks/STIS/CoronagraphyViz/STIS_Coronagraphy_Visualization_v2.ipynb +++ b/notebooks/STIS/CoronagraphyViz/STIS_Coronagraphy_Visualization_v2.ipynb @@ -32,7 +32,7 @@ "tags": [] }, "source": [ - "Some of the most important steps in planning and preparing coronagraphic observations with STIS involve: \n", + "Some of the most important steps in planning and preparing coronagraphic observations with STIS involve:\n", "\n", "- 1. selecting the appropriate occulter position (from the various supported fiducial apertures, visualized in the figure below on an on-orbit lamp flatfield)\n", "- 2. determining the appropriate orientation of the observatory to conduct science observations, often at multiple telescope roll angles to provide angular diversity of imaging for the purposes of post-processing. \n", @@ -494,7 +494,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.9.13" + "version": "3.12.4" } }, "nbformat": 4, diff --git a/notebooks/STIS/CoronagraphyViz/requirements.txt b/notebooks/STIS/CoronagraphyViz/requirements.txt index 8f1e75800..e59763ee6 100644 --- a/notebooks/STIS/CoronagraphyViz/requirements.txt +++ b/notebooks/STIS/CoronagraphyViz/requirements.txt @@ -1,2 +1,2 @@ -matplotlib==3.7.0 -numpy==1.23.4 +matplotlib>=3.7.0 +numpy>=1.23.4 From dfcdb43bea306d8ee65f535786855e9701c2b267 Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Tue, 13 Aug 2024 12:49:30 -0400 Subject: [PATCH 3/5] Update target_acquisition nb dependencies --- notebooks/STIS/target_acquisition/requirements.txt | 8 ++++---- .../STIS/target_acquisition/target_acquisition.ipynb | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/notebooks/STIS/target_acquisition/requirements.txt b/notebooks/STIS/target_acquisition/requirements.txt index 06a796829..a4ae9cd53 100644 --- a/notebooks/STIS/target_acquisition/requirements.txt +++ b/notebooks/STIS/target_acquisition/requirements.txt @@ -1,4 +1,4 @@ -astropy==5.3.3 -astroquery==0.4.6 -matplotlib==3.7.0 -stistools==1.4.4 +astropy>=5.3.3 +astroquery>=0.4.6 +matplotlib>=3.7.0 +stistools>=1.4.4 diff --git a/notebooks/STIS/target_acquisition/target_acquisition.ipynb b/notebooks/STIS/target_acquisition/target_acquisition.ipynb index 3527f840e..256f33ffa 100644 --- a/notebooks/STIS/target_acquisition/target_acquisition.ipynb +++ b/notebooks/STIS/target_acquisition/target_acquisition.ipynb @@ -26,7 +26,7 @@ "metadata": {}, "source": [ "## Introduction\n", - "There are two types of STIS target acquisitions: ACQ and ACQ/PEAKUP. The ACQ is used in almost all STIS observations to center the target. The ACQ/PEAKUP can be taken after the ACQ to further refine the centering and is recommended for observations using slits with widths less than 0.2”. In this notebook, we will go through the steps for ACQ observations, and explore some success and failure cases.\n", + "There are two types of STIS target acquisitions: ACQ and ACQ/PEAKUP. The ACQ is used in almost all STIS observations to center the target. The ACQ/PEAKUP can be taken after the ACQ to further refine the centering and is recommended for observations using slits with widths less than 0.2”. In this notebook, we will go through the steps for ACQ observations, and explore some success and failure cases. \n", "\n", "\n", "For ACQ observations, the target acquisition data has three science extensions:\n", @@ -457,7 +457,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.9.13" + "version": "3.12.4" }, "toc": { "base_numbering": 1, From 0cf7c62ba0e6e54c7e5a338d2b57171a462a183f Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Tue, 13 Aug 2024 12:54:22 -0400 Subject: [PATCH 4/5] Update extraction notebook dependencies --- notebooks/STIS/extraction/1D_Extraction.ipynb | 4 ++-- notebooks/STIS/extraction/requirements.txt | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/notebooks/STIS/extraction/1D_Extraction.ipynb b/notebooks/STIS/extraction/1D_Extraction.ipynb index 41d594b84..1bd9e3fac 100644 --- a/notebooks/STIS/extraction/1D_Extraction.ipynb +++ b/notebooks/STIS/extraction/1D_Extraction.ipynb @@ -27,7 +27,7 @@ "source": [ "## 0 Introduction\n", "\n", - "The `x1d` FITS file is the one-dimensional extracted spectra for individual imsets of `flt`, `sfl`, or `crj` images. The `x1d` file is in binary table with the science information stored in the 'SCI' extension. In this notebook, we will show how to visualize the extraction regions when generating the `x1d` extracted spectra from a `flt` image. In some cases when users work with images with multiple sources or extended background, they might want to customize extraction. The goal of visualizing extraction region is to help confirm that the proper extraction parameters are selected, and the extraction regions do not overlap.\n", + "The `x1d` FITS file is the one-dimensional extracted spectra for individual imsets of `flt`, `sfl`, or `crj` images. The `x1d` file is in binary table with the science information stored in the 'SCI' extension. In this notebook, we will show how to visualize the extraction regions when generating the `x1d` extracted spectra from a `flt` image. In some cases when users work with images with multiple sources or extended background, they might want to customize extraction. The goal of visualizing extraction region is to help confirm that the proper extraction parameters are selected, and the extraction regions do not overlap. \n", "\n", "For more information on extracted spectra, see the STIS Data Handbook: [5.5 Working with Extracted Spectra](https://hst-docs.stsci.edu/stisdhb/chapter-5-stis-data-analysis/5-5-working-with-extracted-spectra)" ] @@ -426,7 +426,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.8.12" + "version": "3.12.4" }, "toc": { "base_numbering": "0", diff --git a/notebooks/STIS/extraction/requirements.txt b/notebooks/STIS/extraction/requirements.txt index 02ec1dd4f..d712bd489 100644 --- a/notebooks/STIS/extraction/requirements.txt +++ b/notebooks/STIS/extraction/requirements.txt @@ -1,4 +1,4 @@ -astropy==5.3.3 -astroquery==0.4.6 -matplotlib==3.7.0 -numpy==1.23.4 +astropy>=5.3.3 +astroquery>=0.4.6 +matplotlib>=3.7.0 +numpy>=1.23.4 From a7611c79a7007e0c2fdb9bb28f61b883fa1d92be Mon Sep 17 00:00:00 2001 From: Hatice Karatay Date: Tue, 27 Aug 2024 17:12:40 -0400 Subject: [PATCH 5/5] update view_data nb dependencies --- notebooks/STIS/view_data/requirements.txt | 14 +++++++------- notebooks/STIS/view_data/view_data.ipynb | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/notebooks/STIS/view_data/requirements.txt b/notebooks/STIS/view_data/requirements.txt index c4abd6299..cd80ddf44 100644 --- a/notebooks/STIS/view_data/requirements.txt +++ b/notebooks/STIS/view_data/requirements.txt @@ -1,7 +1,7 @@ -astropy==5.3.3 -astroquery==0.4.6 -ipython==8.11.0 -matplotlib==3.7.0 -numpy==1.23.4 -pandas==1.5.3 -stistools==1.4.4 +astropy>=5.3.3 +astroquery>=0.4.6 +ipython>=8.11.0 +matplotlib>=3.7.0 +numpy>=1.23.4 +pandas>=1.5.3 +stistools>=1.4.4 diff --git a/notebooks/STIS/view_data/view_data.ipynb b/notebooks/STIS/view_data/view_data.ipynb index d919e33e1..6f365b48a 100644 --- a/notebooks/STIS/view_data/view_data.ipynb +++ b/notebooks/STIS/view_data/view_data.ipynb @@ -64,7 +64,7 @@ "\n", "**Defining some terms:**\n", "\n", - "* **HST:** Hubble Space Telescope\n", + "* **HST:** Hubble Space Telescope \n", "* **STIS:** Space Telescope Imaging Spectrograph on HST (https://www.stsci.edu/hst/instrumentation/stis)\n", "* **STIS/NUV-MAMA:** Cs2Te Multi-Anode Microchannel Array (MAMA) detector for observing mainly in the near ultraviolet (NUV)\n", "* **STIS/FUV-MAMA:** Solar-blind CsI Multi-Anode Microchannel Array (MAMA) detector for observing mainly in the far ultraviolet (FUV)\n", @@ -1171,7 +1171,7 @@ "name": "python", "nbconvert_exporter": "python", "pygments_lexer": "ipython3", - "version": "3.11.3" + "version": "3.12.5" }, "toc": { "base_numbering": 1,