From 578567d68a108708024a02e81d2bbd6d3a30ed04 Mon Sep 17 00:00:00 2001 From: Steph Merritt Date: Wed, 30 Aug 2023 12:34:17 +0100 Subject: [PATCH 1/4] Issue #6: changing aperture to 1 arcsec. --- .../activity/lsst_comet/lsst_comet_activity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py b/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py index b76f71f..498149d 100644 --- a/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py +++ b/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py @@ -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.) except KeyError as err: self._log_exception(err) From cf789c92addbfd3861b967c72eab18092d0e2729 Mon Sep 17 00:00:00 2001 From: Steph Merritt Date: Wed, 30 Aug 2023 12:44:15 +0100 Subject: [PATCH 2/4] Updating test. --- .../lsst_comet/test_PPCalculateApparentMagnitude.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/tests/activity/lsst_comet/test_PPCalculateApparentMagnitude.py b/tests/activity/lsst_comet/test_PPCalculateApparentMagnitude.py index 5125e97..5d719e0 100644 --- a/tests/activity/lsst_comet/test_PPCalculateApparentMagnitude.py +++ b/tests/activity/lsst_comet/test_PPCalculateApparentMagnitude.py @@ -46,9 +46,6 @@ 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"], @@ -56,7 +53,6 @@ def test_PPCalculateSimpleCometaryMagnitude(): "H_r": [15.35, 15.35], "afrho1": [1552, 1552], "k": [-3.35, -3.35], - "seeingFwhmEff": [8.064748, 3.206723], } ) @@ -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) From 08f9c04d10b84ce8858723b4c6b7c8ba2c3c05b6 Mon Sep 17 00:00:00 2001 From: Steph Merritt Date: Wed, 30 Aug 2023 12:52:38 +0100 Subject: [PATCH 3/4] Satisfying linter. --- .../activity/lsst_comet/lsst_comet_activity.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py b/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py index 498149d..2165a43 100644 --- a/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py +++ b/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py @@ -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=1.) + df.loc[df["optFilter"] == filt, "coma_magnitude"] = com.mag(g, filt, rap=1.0) except KeyError as err: self._log_exception(err) From 18eb5e466d644391edbd73ff595aaf625c23357c Mon Sep 17 00:00:00 2001 From: Steph Merritt Date: Thu, 31 Aug 2023 14:12:16 +0100 Subject: [PATCH 4/4] Adding comment. --- .../activity/lsst_comet/lsst_comet_activity.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py b/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py index 2165a43..68b896e 100644 --- a/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py +++ b/src/sorcha_community_utils/activity/lsst_comet/lsst_comet_activity.py @@ -72,6 +72,8 @@ def compute( # this calculates the coma magnitude in each filter try: for filt in observing_filters: + # here rap is the aperture width, hardcoded here to 1.0 arcsec + # the code assumes an infinite coma so is thus only accurate for small apertures df.loc[df["optFilter"] == filt, "coma_magnitude"] = com.mag(g, filt, rap=1.0) except KeyError as err: self._log_exception(err)