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

Revert "Removal of ASDA and its util funtions (#118)" #123

Merged
merged 5 commits into from
Feb 13, 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
5 changes: 4 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ repos:
exclude: ".*(.fits|.fts|.fit|.txt|.csv)$"
- id: check-yaml
- id: debug-statements

- repo: https://github.com/codespell-project/codespell
rev: v2.2.2
hooks:
- id: codespell
ci:
autofix_prs: false
12 changes: 0 additions & 12 deletions changelog/118.breaking.rst

This file was deleted.

1 change: 1 addition & 0 deletions docs/code_ref/asda.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.. automodapi:: sunkit_image.asda
1 change: 1 addition & 0 deletions docs/code_ref/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ API Reference
.. toctree::
:maxdepth: 2

asda
coalignment
enhance
granule
Expand Down
2 changes: 1 addition & 1 deletion examples/radial_gradient_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
###########################################################################
# We will need to work out a few parameters for the FNRGF.
# Order is the number of Fourier coefficients to be used in the approximation.
# The attentuation coefficient are calculated to be linearly decreasing, you should
# The attenuation coefficient are calculated to be linearly decreasing, you should
# choose them according to your requirements.
order = 20
attenuation_coefficients = radial.set_attenuation_coefficients(order)
Expand Down
2 changes: 1 addition & 1 deletion examples/tracing_loops.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
# The maximum number of structures to be examined ``nstruc`` is 1000.
# The number of extra points in the loop below noise level to terminate a loop tracing ``ngap`` is 0.
# The base flux and median flux ratio ``qthresh1`` is 0.0.
# The noise threshold in the image with repect to median flux ``qthresh2`` is 3.0 .
# The noise threshold in the image with respect to median flux ``qthresh2`` is 3.0 .
# For the meaning of these parameters please consult the OCCULT2 article.
loops = trace.occult2(trace_map.data, nsm1=3, rmin=30, lmin=25, nstruc=1000, ngap=0, qthresh1=0.0, qthresh2=3.0)

Expand Down
21 changes: 21 additions & 0 deletions licenses/LICENSE_ASDA.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2023 Jiajia Liu

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,10 @@ filterwarnings =
ignore:'cgi' deprecated and slated for removal in Python 3.13:DeprecationWarning

[pycodestyle]
max_line_length = 110
max_line_length = 120

[flake8]
max-line-length = 110
max-line-length = 120

[isort]
balanced_wrapping = True
Expand All @@ -114,7 +114,7 @@ known_astropy = astropy, asdf, sunpy
known_first_party = sunkit_image
length_sort = False
length_sort_sections=stdlib
line_length = 110
line_length = 120
multi_line_output = 3
no_lines_before = LOCALFOLDER
sections = STDLIB, THIRDPARTY, ASTROPY, FIRSTPARTY, LOCALFOLDER
Expand Down
Loading