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.

Sign up for GitHub

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

Clarifications for super-Gaussian windowing #202

Open
wants to merge 14 commits into
base: main
Choose a base branch
from
Open

Clarifications for super-Gaussian windowing #202

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
9754df4
Added docstrings to super-Gaussian functions, added window_contours p…
tomasstolker Dec 13, 2023
cba54b5
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Dec 13, 2023
ae52eb0
Changed the window parameter in super_gaussian back to sigma
tomasstolker Jan 2, 2024
2badd7b
Fixed parameter name when calling super_gaussian
tomasstolker Jan 2, 2024
17f555e
Solved merge conflict
tomasstolker Jan 3, 2024
cf04ba3
Fixed documentation of window parameter to HWHM, added warnings about…
tomasstolker Jan 4, 2024
809311e
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jan 4, 2024
3f05a38
Added back the factor 2 to change from HWHM to FWHM
tomasstolker Jan 4, 2024
af0e6a4
Commented the warnings about apod deprecation
tomasstolker Jan 4, 2024
df92aa9
Removed comments
tomasstolker Jan 4, 2024
24362d2
Merge branch 'main' into super_gauss
tomasstolker Jul 16, 2024
9419a31
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 16, 2024
b2aa286
Merge branch 'main' into super_gauss
tomasstolker Sep 11, 2024
c9ba5fd
Merge branch 'super_gauss' of github.com:tomasstolker/AMICAL into sup…
tomasstolker Sep 11, 2024
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
116 changes: 58 additions & 58 deletions amical/data_processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,7 +368,7 @@ def show_clean_params(
f_kernel=3,
offx=0,
offy=0,
apod=False,
apod=True,
window=None,
*,
ifu=False,
Expand Down Expand Up @@ -396,34 +396,34 @@ def show_clean_params(
from astropy.io import fits
from matplotlib.colors import PowerNorm

if apod:
warnings.warn(
"The 'apod' parameter is deprecated and will be "
"removed in a future release. Please only use "
"the 'window' parameter instead. The argument of "
"'window' can be set to None for not applying the "
"super-Gaussian windowing.",
DeprecationWarning,
)

if window is None:
warnings.warn(
"The argument of 'apod' will be forced to "
"False because the argument of `window` was "
"set to None`."
)

apod = False

elif not apod and window is not None:
warnings.warn(
"The argument of 'apod' will be forced to "
"True because the `window` size has been "
"set. To not apply the apodization, please "
"set the argument of 'window' to None."
)

apod = True
# if apod:
# warnings.warn(
# "The 'apod' parameter is deprecated and will be "
# "removed in a future release. Please only use "
# "the 'window' parameter instead. The argument of "
# "'window' can be set to None for not applying the "
# "super-Gaussian windowing.",
# DeprecationWarning,
# )
#
# if window is None:
# warnings.warn(
# "The argument of 'apod' will be forced to "
# "False because the argument of `window` was "
# "set to None`."
# )
#
# apod = False
#
# elif not apod and window is not None:
# warnings.warn(
# "The argument of 'apod' will be forced to "
# "True because the `window` size has been "
# "set. To not apply the apodization, please "
# "set the argument of 'window' to None."
# )
#
# apod = True
neutrinoceros marked this conversation as resolved.
Show resolved Hide resolved

with fits.open(filename) as fd:
data = fd[ihdu].data
Expand Down Expand Up @@ -620,7 +620,7 @@ def clean_data(
edge=0,
bad_map=None,
add_bad=None,
apod=False,
apod=True,
offx=0,
offy=0,
sky=True,
Expand Down Expand Up @@ -781,34 +781,34 @@ def select_clean_data(
"""
from astropy.io import fits

if apod:
warnings.warn(
"The 'apod' parameter is deprecated and will be "
"removed in a future release. Please only use "
"the 'window' parameter instead. The argument of "
"'window' can be set to None for not applying the "
"super-Gaussian windowing.",
DeprecationWarning,
)

if window is None:
warnings.warn(
"The argument of 'apod' will be forced to "
"False because the argument of `window` was "
"set to None`."
)

apod = False

elif not apod and window is not None:
warnings.warn(
"The argument of 'apod' will be forced to "
"True because the `window` size has been "
"set. To not apply the apodization, please "
"set the argument of 'window' to None."
)

apod = True
# if apod:
# warnings.warn(
# "The 'apod' parameter is deprecated and will be "
# "removed in a future release. Please only use "
# "the 'window' parameter instead. The argument of "
# "'window' can be set to None for not applying the "
# "super-Gaussian windowing.",
# DeprecationWarning,
# )
#
# if window is None:
# warnings.warn(
# "The argument of 'apod' will be forced to "
# "False because the argument of `window` was "
# "set to None`."
# )
#
# apod = False
#
# elif not apod and window is not None:
# warnings.warn(
# "The argument of 'apod' will be forced to "
# "True because the `window` size has been "
# "set. To not apply the apodization, please "
# "set the argument of 'window' to None."
# )
#
# apod = True

with fits.open(filename) as hdu:
cube = hdu[ihdu].data
Expand Down