Merge branch 'nanograv:master' into validation

dlakaplan · Dec 30, 2023 · 26a5a44 · 26a5a44
2 parents 627ff97 + 216e7e6
commit 26a5a44
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 0 deletions.
diff --git a/CHANGELOG-unreleased.md b/CHANGELOG-unreleased.md
@@ -11,6 +11,7 @@ the released changes.
 ### Changed
 - Moved `get_derived_params` to `timing_model`
 - `check_ephemeris_connection` CI test no longer requires access to static NANOGrav site
+- `TimingModel.compare()` now calls `change_binary_epoch()`.
 ### Added
 - Added numdifftools to setup.cfg to match requirements.txt
 - Documentation: Added `convert_parfile` to list of command-line tools in RTD

diff --git a/src/pint/models/timing_model.py b/src/pint/models/timing_model.py
@@ -2255,6 +2255,7 @@ def compare(
                 "Updating POSEPOCH in %s to match %s" % (other_model_name, model_name)
             )
             othermodel.change_posepoch(self.POSEPOCH.value)
+
         if (
             "PEPOCH" in self.params
             and "PEPOCH" in othermodel.params
@@ -2265,6 +2266,7 @@ def compare(
                 "Updating PEPOCH in %s to match %s" % (other_model_name, model_name)
             )
             othermodel.change_pepoch(self.PEPOCH.value)
+
         if (
             "DMEPOCH" in self.params
             and "DMEPOCH" in othermodel.params
@@ -2275,6 +2277,33 @@ def compare(
                 "Updating DMEPOCH in %s to match %s" % (other_model_name, model_name)
             )
             othermodel.change_dmepoch(self.DMEPOCH.value)
+
+        if (
+            self.BINARY.value is not None
+            and othermodel.BINARY.value is not None
+            and self.BINARY.value == othermodel.BINARY.value
+        ):
+            log.info(
+                "Updating binary epoch (T0 or TASC) in %s to match %s"
+                % (other_model_name, model_name)
+            )
+            if (
+                "T0" in self
+                and "T0" in othermodel
+                and self.T0.value is not None
+                and othermodel.T0.value is not None
+                and self.T0.value != othermodel.T0.value
+            ):
+                othermodel.change_binary_epoch(self.T0.quantity)
+            elif (
+                "TASC" in self
+                and "TASC" in othermodel
+                and self.TASC.value is not None
+                and othermodel.TASC.value is not None
+                and self.TASC.value != othermodel.TASC.value
+            ):
+                othermodel.change_binary_epoch(self.TASC.quantity)
+
         if (
             "AstrometryEquatorial" in self.components
             and "AstrometryEcliptic" in othermodel.components

diff --git a/tests/test_compare_model.py b/tests/test_compare_model.py
@@ -1,4 +1,5 @@
 from io import StringIO
+from copy import deepcopy
 
 import pytest
 
@@ -112,3 +113,13 @@ def test_compare_parfile_script():
 
     argv = f"{args} {parfile1} {parfile2}".split()
     compare_parfiles.main(argv)
+
+
+def test_compare_model_binary():
+    m1 = get_model(StringIO(par_bin))
+
+    m2 = deepcopy(m1)
+    m2.TASC.value = 57001
+
+    m1.compare(m2)
+    m2.compare(m1)