Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix suffix list test for new nsclean step #8111

Merged
merged 3 commits into from
Dec 6, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -88,15 +88,15 @@ used for Linux and Mac OS systems.

Linux:

conda create -n jwstdp-1.8.2 --file https://ssb.stsci.edu/releases/jwstdp/1.8.2/conda_python_stable-deps.txt
conda activate jwstdp-1.8.2
pip install -r https://ssb.stsci.edu/releases/jwstdp/1.8.2/reqs_stable-deps.txt
conda create -n jwstdp-1.12.5 --file https://ssb.stsci.edu/releases/jwstdp/1.12.5/conda_python_stable-deps.txt
conda activate jwstdp-1.12.5
pip install -r https://ssb.stsci.edu/releases/jwstdp/1.12.5/reqs_stable-deps.txt

MacOS:

conda create -n jwstdp-1.8.2 --file https://ssb.stsci.edu/releases/jwstdp/1.8.2/conda_python_macos-stable-deps.txt
conda activate jwstdp-1.8.2
pip install -r https://ssb.stsci.edu/releases/jwstdp/1.8.2/reqs_macos-stable-deps.txt
conda create -n jwstdp-1.12.5 --file https://ssb.stsci.edu/releases/jwstdp/1.12.5/conda_python_macos-stable-deps.txt
conda activate jwstdp-1.12.5
pip install -r https://ssb.stsci.edu/releases/jwstdp/1.12.5/reqs_macos-stable-deps.txt

Each DMS delivery has its own installation instructions, which may be found in
the corresponding release documentation linked from this page:
Expand Down Expand Up @@ -210,10 +210,10 @@ the specified context and less than the context for the next release.

| jwst tag | DMS build | SDP_VER | CRDS_CONTEXT | Released | Ops Install | Notes |
|---------------------|-----------|----------|--------------|------------|-------------|-----------------------------------------------|
| 1.12.5 | B10.0.1 | 2023.3.0 | 1140 | 2023-10-19 | | Patch release B10.0.1 |
| 1.12.4 | | 2023.3.0 | 1135 | 2023-10-12 | | Pinning dependencies for external users |
| 1.12.5 | B10.0.1 | 2023.3.1 | 1166 | 2023-10-19 | 2023-12-05 | Patch release B10.0.1 |
| 1.12.4 | | | | 2023-10-12 | | Pinning dependencies for external users |
| 1.12.3 | B10.0 | 2023.3.0 | 1135 | 2023-10-03 | 2023-12-05 | Final release candidate for B10.0 |
| 1.12.2 | B10.0rc3 | | 1135 | 2023-10-02 | (tentative) | Third release candidate for B10.0 |
| 1.12.2 | B10.0rc3 | | 1135 | 2023-10-02 | | Third release candidate for B10.0 |
| 1.12.1 | B10.0rc2 | | 1132 | 2023-09-26 | | Second release candidate for B10.0 |
| 1.12.0 | B10.0rc1 | | 1130 | 2023-09-18 | | First release candidate for B10.0 |
| 1.11.4 | B9.3.1 | 2023.2.1 | 1107 | 2023-08-14 | 2023-08-24 | Final release for B9.3.1 patch |
Expand Down
1 change: 1 addition & 0 deletions jwst/lib/suffix.py
Original file line number Diff line number Diff line change
Expand Up @@ -149,6 +149,7 @@
'combine1dstep',
'tsophotometrystep',
'spec3pipeline',
'nsclean',
'nscleanstep',
'outlierdetectionstep',
'groupscalestep',
Expand Down
4 changes: 2 additions & 2 deletions jwst/nsclean/lib.py
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
FW = np.fft.rfft2(np.fft.ifftshift(W))
with np.errstate(divide='ignore'):
self.P = 1 / np.fft.irfft2(np.fft.rfft2(np.array(self.mask, dtype=np.float32)) * FW, (self.ny,self.nx))
self.P = np.where(self.mask==True, self.P, 0.) # Illuminated areas carry no weight
self.P = np.where(self.mask, self.P, 0.) # Illuminated areas carry no weight

Check warning on line 94 in jwst/nsclean/lib.py

View check run for this annotation

Codecov / codecov/patch

jwst/nsclean/lib.py#L94

Added line #L94 was not covered by tests

# Build a 1-dimensional Gaussian kernel for "buffing". Buffing is in the
# dispersion direction only. In detector coordinates, this is axis zero. Even though
Expand Down Expand Up @@ -484,7 +484,7 @@
_M = np.hstack((self.mask, np.zeros((self.ny,self.nloh), dtype=np.bool_))).flatten() # Add new line overhead to mask
with np.errstate(divide='ignore'):
P = 1/np.fft.irfft(np.fft.rfft(np.array(_M, dtype=np.float32)) * FW, self.n) # Compute weights
P = P[_M==True] # Keep only background samples
P = P[_M] # Keep only background samples

Check warning on line 487 in jwst/nsclean/lib.py

View check run for this annotation

Codecov / codecov/patch

jwst/nsclean/lib.py#L487

Added line #L487 was not covered by tests

# NSClean's weighting requires the Moore-Penrose invers of A = P*B.
# $A^+ = (A^H A)^{-1} A^H$
Expand Down