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

Jump to bottom

Issue #6: Changing default aperture in lsst_comet_activity.py #7

Merged
merged 4 commits into from
Aug 31, 2023
Merged

Issue #6: Changing default aperture in lsst_comet_activity.py #7

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
578567d
Issue #6: changing aperture to 1 arcsec.
astronomerritt Aug 30, 2023
cf789c9
Updating test.
astronomerritt Aug 30, 2023
08f9c04
Satisfying linter.
astronomerritt Aug 30, 2023
18eb5e4
Adding comment.
astronomerritt Aug 31, 2023
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
2 changes: 1 addition & 1 deletion src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ def compute(
# this calculates the coma magnitude in each filter
try:
for filt in observing_filters:
df.loc[df["optFilter"] == filt, "coma_magnitude"] = com.mag(g, filt, rap=df["seeingFwhmEff"])
df.loc[df["optFilter"] == filt, "coma_magnitude"] = com.mag(g, filt, rap=1.0)
except KeyError as err:
self._log_exception(err)

Expand Down
6 changes: 1 addition & 5 deletions tests/activity/lsst_comet/test_PPCalculateApparentMagnitude.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,17 +46,13 @@ def test_PPCalculateSimpleCometaryMagnitude():
# Updates the dictionary of available subclasses of `AbstractCometaryActivity`
update_activity_subclasses()

# data is for 67P, taken by Colin Snodgrass, and validated against same
# abnormally large seeing is to account for Colin's use of an aperture measured at comet distance

cometary_obs = pd.DataFrame(
{
"optFilter": ["r", "r"],
"TrailedSourceMag": [19.676259, 22.748274],
"H_r": [15.35, 15.35],
"afrho1": [1552, 1552],
"k": [-3.35, -3.35],
"seeingFwhmEff": [8.064748, 3.206723],
}
)

Expand All @@ -66,4 +62,4 @@ def test_PPCalculateSimpleCometaryMagnitude():

df_comet = PPCalculateSimpleCometaryMagnitude(cometary_obs, ["r"], rho, delta, alpha, "lsst_comet")

assert_almost_equal(df_comet["TrailedSourceMag"], [13.516, 22.010], decimal=3)
assert_almost_equal(df_comet["TrailedSourceMag"], [15.757, 22.461], decimal=3)