From 4e9c5b9fed9094f5aa844a9a5692e9b6bad5f950 Mon Sep 17 00:00:00 2001 From: Steph Merritt <97111051+astronomerritt@users.noreply.github.com> Date: Wed, 10 Jan 2024 14:40:47 +0000 Subject: [PATCH] Fix H columns for single-filter runs (#768) * Making sure H_original column added for single filter. * Fixing column names. --- src/sorcha/modules/PPCalculateApparentMagnitude.py | 2 +- tests/sorcha/test_PPCalculateApparentMagnitude.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/sorcha/modules/PPCalculateApparentMagnitude.py b/src/sorcha/modules/PPCalculateApparentMagnitude.py index c68085f3..0039bc7a 100644 --- a/src/sorcha/modules/PPCalculateApparentMagnitude.py +++ b/src/sorcha/modules/PPCalculateApparentMagnitude.py @@ -68,7 +68,7 @@ def PPCalculateApparentMagnitude( observations, phasefunction, othercolours, observing_filters, mainfilter ) else: - observations.rename(columns={"H_" + mainfilter: "H_filter"}, inplace=True) + observations["H_filter"] = observations["H_" + mainfilter].copy() # calculate main body apparent magnitude in observation filter verboselog("Calculating apparent magnitude in filter...") diff --git a/tests/sorcha/test_PPCalculateApparentMagnitude.py b/tests/sorcha/test_PPCalculateApparentMagnitude.py index d7111eee..cf73a032 100644 --- a/tests/sorcha/test_PPCalculateApparentMagnitude.py +++ b/tests/sorcha/test_PPCalculateApparentMagnitude.py @@ -211,6 +211,8 @@ def test_PPCalculateApparentMagnitude(): assert_almost_equal(asteroid_out["TrailedSourceMag"].values[0], 13.281578, decimal=6) assert_almost_equal(asteroid_out["H_filter"].values[0], 7.19, decimal=6) + assert_almost_equal(asteroid_out["H_r"].values[0], 7.3, decimal=6) assert_almost_equal(asteroid_single["TrailedSourceMag"].values[0], 13.391578, decimal=6) assert_almost_equal(asteroid_single["H_filter"].values[0], 7.3, decimal=6) + assert_almost_equal(asteroid_single["H_r"].values[0], 7.3, decimal=6)