Skip to content

Commit

Permalink
Requirements edits. (#309)
Browse files Browse the repository at this point in the history
* Requirements edits.

* Small changes to notebooks to trigger CI.

* Refactor command execution

---------

Co-authored-by: Hatice Karatay <[email protected]>
  • Loading branch information
alyssaguzman and haticekaratay authored Sep 18, 2024
1 parent 9fa2fd8 commit 584e38b
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 41 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@
"\n",
"`$ conda update hstcal`\n",
"\n",
"`$ conda update acstools`"
"`$ conda update acstools` "
]
},
{
Expand Down
16 changes: 8 additions & 8 deletions notebooks/ACS/acs_cte_forward_model/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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`. "
]
},
{
Expand Down
4 changes: 2 additions & 2 deletions notebooks/ACS/acs_findsat_mrt/requirements.txt
Original file line number Diff line number Diff line change
@@ -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
17 changes: 4 additions & 13 deletions notebooks/ACS/acs_sbc_dark_analysis/acs_sbc_dark_analysis.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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."
]
},
{
Expand Down Expand Up @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -742,13 +740,6 @@
"<br></br>\n",
"<br></br>"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand All @@ -767,7 +758,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.4"
"version": "3.11.7"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion notebooks/ACS/acs_sbc_dark_analysis/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
22 changes: 8 additions & 14 deletions notebooks/ACS/acs_subarrays/acs_subarrays.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -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). "
]
},
{
Expand Down Expand Up @@ -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()"
]
},
{
Expand Down Expand Up @@ -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()"
]
},
{
Expand Down Expand Up @@ -741,13 +742,6 @@
"<br></br>\n",
"<br></br>"
]
},
{
"cell_type": "code",
"execution_count": null,
"metadata": {},
"outputs": [],
"source": []
}
],
"metadata": {
Expand All @@ -766,7 +760,7 @@
"name": "python",
"nbconvert_exporter": "python",
"pygments_lexer": "ipython3",
"version": "3.12.4"
"version": "3.11.7"
}
},
"nbformat": 4,
Expand Down
2 changes: 1 addition & 1 deletion notebooks/ACS/acs_subarrays/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
acstools>=3.5.0
acstools>=3.7.2
astropy>=5.3.3
astroquery>=0.4.6
stwcs>=1.7.2
Expand Down

0 comments on commit 584e38b

Please sign in to comment.