Skip to content

Commit ef2d471

Browse files
authored
Merge pull request #468 from larrybradley/fix-region-files
Fix DS9 region files
2 parents 5fed675 + ba9fb02 commit ef2d471

6 files changed

Lines changed: 32 additions & 36 deletions

File tree

README.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ Here, you can find detailed documentation for each instrument the Hubble Space T
3232
- [Space Telescope Imaging Spectrograph (STIS)](https://www.stsci.edu/hst/instrumentation/stis)
3333

3434
- [Wide Field Camera 3 (WFC3)](https://www.stsci.edu/hst/instrumentation/wfc3)
35-
35+
3636

3737
Installation Instructions
3838
=========================
@@ -43,15 +43,15 @@ See [this website](https://spacetelescope.github.io/hst_notebooks/)
4343

4444
To download and execute the notebooks, we recommend you clone
4545
the `hst_notebooks <https://github.com/spacetelescope/hst_notebooks>`
46-
repository to your local computer.
46+
repository to your local computer.
4747

4848
You can also click the "Download ZIP" option for the entire repository listed under the green "Code" button at the top of the repository landing page. You are also able to download individual notebooks, but it is not as straight forward or recommended, so we do not provide details here.
4949

5050
Most notebooks have additional associated files in their folder,
5151
including a requirements file that lists packages necessary to run the notebooks.
52-
The packages in the requirements file can be installed using `pip <https://pip.pypa.io/en/stable/>`.
52+
The packages in the requirements file can be installed using `pip <https://pip.pypa.io/en/stable/>`.
5353

54-
Any version dependencies are contained in the requirements file in
54+
Any version dependencies are contained in the requirements file in
5555
each notebook folder. Please use at least the minimum supported
5656
version of the Python language in your active environment.
5757

@@ -63,7 +63,7 @@ Clone the Repository
6363
--------------------
6464

6565
Once you've changed to the directory where you cloned this repository, and go to
66-
the notebook directory you are interested in using, and go to your selected
66+
the notebook directory you are interested in using, and go to your selected
6767
notebook, as below:
6868

6969
git clone https://github.com/spacetelescope/hst_notebooks.git
@@ -91,16 +91,16 @@ In the case that there is no pre-requirements.sh file:
9191
conda create --name hstnb python pip jupyter
9292
conda activate hstnb
9393
pip install -r requirements.txt
94-
94+
9595

9696
In the case that there is a pre-requirements.sh file, this file is likely
9797
only used to install hstcal. You can either install hstcal in the `hstnb`
98-
environment you created above...
99-
98+
environment you created above...
99+
100100
conda install --yes -c conda-forge hstcal
101101

102102

103-
or you can create the appropriate environment starting
103+
or you can create the appropriate environment starting
104104
with hstcal using the following:
105105

106106
conda create --yes -n hstcal -c conda-forge hstcal
@@ -114,25 +114,25 @@ In this case, `stenv` should already have hstcal installed. You
114114
can activate the environment, and then update it to use the notebooks requirements file:
115115

116116
conda activate stenv
117-
pip install -r requirments.txt
118-
117+
pip install -r requirements.txt
118+
119119
If pip reports conflicts, then you might need to follow the above instructions to create
120120
a new, isolated environment instead of using `hstcal`
121121

122122

123123
Help
124124
====
125-
If you uncover any issues or bugs, you can [open an issue on GitHub](https://github.com/spacetelescope/hst_notebooks/issues/new).
125+
If you uncover any issues or bugs, you can [open an issue on GitHub](https://github.com/spacetelescope/hst_notebooks/issues/new).
126126
For faster responses, however, we encourage you to submit an [HST Help Desk Ticket](https://hsthelp.stsci.edu).
127127

128128

129129

130130
Contributing
131131
============
132132

133-
New contributions and feedback are very welcomed! Please open a new issue or new
134-
pull request for bugs, feedback, or new features you would like to see. If there
135-
is an issue you would like to work on, please leave a comment and we will be happy
133+
New contributions and feedback are very welcomed! Please open a new issue or new
134+
pull request for bugs, feedback, or new features you would like to see. If there
135+
is an issue you would like to work on, please leave a comment and we will be happy
136136
to assist. Questions can also be sent through the [HST Help Desk](https://stsci.service-now.com/hst).
137137

138138
If you wish to contribute new notebooks or major reworks of existing notebooks, see [contributing instructions](https://github.com/spacetelescope/hst_notebooks/blob/main/CONTRIBUTING.md).

index.md

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,15 @@ See [this website](https://spacetelescope.github.io/hst_notebooks/)
4646

4747
To download and execute the notebooks, we recommend you clone
4848
the `hst_notebooks <https://github.com/spacetelescope/hst_notebooks>`
49-
repository to your local computer.
49+
repository to your local computer.
5050

5151
You can also click the "Download ZIP" option for the entire repository listed under the green "Code" button at the top of the repository landing page. You are also able to download individual notebooks, but it is not as straight forward or recommended, so we do not provide details here.
5252

5353
Most notebooks have additional associated files in their folder,
5454
including a requirements file that lists packages necessary to run the notebooks.
55-
The packages in the requirements file can be installed using `pip <https://pip.pypa.io/en/stable/>`.
55+
The packages in the requirements file can be installed using `pip <https://pip.pypa.io/en/stable/>`.
5656

57-
Any version dependencies are contained in the requirements file in
57+
Any version dependencies are contained in the requirements file in
5858
each notebook folder. Please use at least the minimum supported
5959
version of the Python language in your active environment.
6060

@@ -64,7 +64,7 @@ Some notebooks use the HSTCAL package. The folders for these notebooks will also
6464
### Clone the Repository
6565

6666
Once you've changed to the directory where you cloned this repository, go to
67-
the notebook directory you are interested in using, and go to your selected
67+
the notebook directory you are interested in using, and go to your selected
6868
notebook, as below:
6969

7070
git clone https://github.com/spacetelescope/hst_notebooks.git
@@ -91,19 +91,19 @@ In the case that there is no pre-requirements.sh file:
9191
conda create --name hstnb python pip jupyter
9292
conda activate hstnb
9393
pip install -r requirements.txt
94-
94+
9595

9696
In the case that there is a pre-requirements.sh file, you can either install hstcal in the `hstnb`
9797
environment you created above by:
9898

9999
<shell> pre-requirements.sh
100100

101-
or
101+
or
102102

103103
conda install --yes -c conda-forge hstcal
104104

105105

106-
or you can create the appropriate environment starting
106+
or you can create the appropriate environment starting
107107
with hstcal using the following:
108108

109109
conda create --yes -n hstcal -c conda-forge hstcal
@@ -119,23 +119,23 @@ In this case, `stenv` should already have hstcal installed. You
119119
can activate the environment, and then update it to use the notebooks requirements file:
120120

121121
conda activate stenv
122-
pip install -r requirments.txt
123-
122+
pip install -r requirements.txt
123+
124124
If pip reports conflicts, then you might need to follow the above instructions to create
125125
a new, isolated environment instead of using `hstcal`
126126

127127

128128
## Help
129129

130-
If you uncover any issues or bugs, you can [open an issue on GitHub](https://github.com/spacetelescope/hst_notebooks/issues/new).
130+
If you uncover any issues or bugs, you can [open an issue on GitHub](https://github.com/spacetelescope/hst_notebooks/issues/new).
131131
For faster responses, however, we encourage you to submit an [HST Help Desk Ticket](https://hsthelp.stsci.edu).
132132

133133

134134
## Contributing
135135

136-
New contributions and feedback are very welcomed! Please open a new issue or new
137-
pull request for bugs, feedback, or new features you would like to see. If there
138-
is an issue you would like to work on, please leave a comment and we will be happy
136+
New contributions and feedback are very welcomed! Please open a new issue or new
137+
pull request for bugs, feedback, or new features you would like to see. If there
138+
is an issue you would like to work on, please leave a comment and we will be happy
139139
to assist. Questions can also be sent through the [HST Help Desk](https://stsci.service-now.com/hst).
140140

141141
If you wish to contribute new notebooks or major reworks of existing notebooks, see [contributing instructions](https://github.com/spacetelescope/hst_notebooks/blob/main/CONTRIBUTING.md).

notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/jcdua3f4q_sci1_exclude.reg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Region file format: DS9 version 4.1
2-
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman"
3-
select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
2+
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman" select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
43
image
54
-polygon(3702,845,3819,890,3804,797,3734,720,3671,745,3592,735,3602,770,3660,782)
65
-ellipse(3512,809,26,67,0)

notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/jcdua3f4q_sci1_include.reg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Region file format: DS9 version 4.1
2-
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman"
3-
select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
2+
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman" select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
43
image
54
polygon(3702,845,3819,890,3804,797,3734,720,3671,745,3592,735,3602,770,3660,782)
65
ellipse(3512,809,26,67,0)

notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/jcdua3f4q_sci1_include_no_box.reg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Region file format: DS9 version 4.1
2-
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman"
3-
select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
2+
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman" select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
43
image
54
polygon(3702,845,3819,890,3804,797,3734,720,3671,745,3592,735,3602,770,3660,782)
65
ellipse(3512,809,26,67,0)

notebooks/DrizzlePac/use_ds9_regions_in_tweakreg/jcdua3f4q_sci1_include_no_box_first.reg

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# Region file format: DS9 version 4.1
2-
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman"
3-
select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
2+
global color=yellow dashlist=8 3 width=2 font="helvetica 10 normal roman" select=1 highlite=1 dash=0 fixed=0 edit=1 move=1 delete=1 include=1 source=1
43
image
54
-box(3541,393,113,96,0)
65
polygon(3702,845,3819,890,3804,797,3734,720,3671,745,3592,735,3602,770,3660,782)

0 commit comments

Comments
 (0)