From eb08832e4d90eb6563896d08480f551814b990e1 Mon Sep 17 00:00:00 2001 From: Pedro Bernardinelli Date: Fri, 1 Sep 2023 16:54:51 -0700 Subject: [PATCH 1/4] Update sinusoidal_lightcurve.py Fix sine wave implementation.... --- .../lightcurve/sinusoidal/sinusoidal_lightcurve.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py b/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py index acc1e14..9a1d85f 100644 --- a/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py +++ b/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py @@ -39,8 +39,8 @@ def compute(self, df: pd.DataFrame) -> np.array: # Verify that the input data frame contains each of the required columns. self._validate_column_names(df) - modtime = np.mod((df["FieldMJD"] + df["Time0"]) / df["Period"], 2 * np.pi) - return df["LCA"] * np.sin(modtime) + time = 2 * np.pi * (df["FieldMJD"] - df["Time0"])/df["Period"] + return df["LCA"] * np.sin(time) @staticmethod def name_id() -> str: From be4fb6afb5041e907612580d24c4c8410fa65f7f Mon Sep 17 00:00:00 2001 From: drewoldag <47493171+drewoldag@users.noreply.github.com> Date: Tue, 5 Sep 2023 13:16:08 -0700 Subject: [PATCH 2/4] Running black linter. --- .../lightcurve/sinusoidal/sinusoidal_lightcurve.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py b/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py index 9a1d85f..98c3783 100644 --- a/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py +++ b/src/sorcha_community_utils/lightcurve/sinusoidal/sinusoidal_lightcurve.py @@ -39,7 +39,7 @@ def compute(self, df: pd.DataFrame) -> np.array: # Verify that the input data frame contains each of the required columns. self._validate_column_names(df) - time = 2 * np.pi * (df["FieldMJD"] - df["Time0"])/df["Period"] + time = 2 * np.pi * (df["FieldMJD"] - df["Time0"]) / df["Period"] return df["LCA"] * np.sin(time) @staticmethod From 571927b79e4c89e88a9c66bf8fb2208bc7542f46 Mon Sep 17 00:00:00 2001 From: Pedro Bernardinelli Date: Wed, 20 Sep 2023 09:23:00 -0700 Subject: [PATCH 3/4] Update unit test --- tests/lightcurve/sinusoidal/test_sinusoidal.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/lightcurve/sinusoidal/test_sinusoidal.py b/tests/lightcurve/sinusoidal/test_sinusoidal.py index d0f8d98..db3a1cc 100644 --- a/tests/lightcurve/sinusoidal/test_sinusoidal.py +++ b/tests/lightcurve/sinusoidal/test_sinusoidal.py @@ -9,10 +9,10 @@ def test_sinusoidal_lightcurve_name(): def test_compute_simple(): data_dict = { - "FieldMJD": [1], + "FieldMJD": [np.pi/2], "LCA": [1], "Period": [1], - "Time0": [1], + "Time0": [0], } df = pd.DataFrame.from_dict(data_dict) @@ -20,4 +20,4 @@ def test_compute_simple(): model = SinusoidalLightCurve() output = model.compute(df) - assert np.isclose(output.values[0], 0.909297) + assert np.isclose(output.values[0], 1) From 4a8b74e22d094bd9fd5dd6abb4a66481b648ac8e Mon Sep 17 00:00:00 2001 From: Pedro Bernardinelli Date: Wed, 20 Sep 2023 09:31:22 -0700 Subject: [PATCH 4/4] Typo - whoops --- tests/lightcurve/sinusoidal/test_sinusoidal.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/lightcurve/sinusoidal/test_sinusoidal.py b/tests/lightcurve/sinusoidal/test_sinusoidal.py index db3a1cc..38baf78 100644 --- a/tests/lightcurve/sinusoidal/test_sinusoidal.py +++ b/tests/lightcurve/sinusoidal/test_sinusoidal.py @@ -9,7 +9,7 @@ def test_sinusoidal_lightcurve_name(): def test_compute_simple(): data_dict = { - "FieldMJD": [np.pi/2], + "FieldMJD": [1./4], "LCA": [1], "Period": [1], "Time0": [0],