Merge branch 'master' of github.com:transientlunatic/heron

Author: transientlunatic

.github/workflows/review.yml

@@ -14,10 +14,10 @@ jobs:
     steps:
     - uses: actions/checkout@v2
 
-    - name: Set up Python 3.8
+    - name: Set up Python 3.10
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: "3.10"
 
     - name: Install dependencies
       run: |

heron/models/lalsimulation.py

@@ -168,16 +168,15 @@ def time_domain(self, parameters, times=None):
                 spl_hx = CubicSpline(times_wf, hx.data.data)
                 hp_data = spl_hp(times)
                 hx_data = spl_hx(times)
-                hp_ts = Waveform(data=hp_data, times=times + epoch)
-                hx_ts = Waveform(data=hx_data, times=times + epoch)
+                hp_ts = Waveform(data=hp_data, times=times)
+                hx_ts = Waveform(data=hx_data, times=times)
                 parameters.pop("time")
 
             else:
                 hp_data = hp.data.data
                 hx_data = hx.data.data
                 hp_ts = Waveform(data=hp_data, dt=hp.deltaT, t0=hp.epoch + epoch)
                 hx_ts = Waveform(data=hx_data, dt=hx.deltaT, t0=hx.epoch + epoch)
-
             self._cache = WaveformDict(parameters=parameters, plus=hp_ts, cross=hx_ts)
         return self._cache
 

requirements.txt

@@ -1,5 +1,5 @@
-matplotlib==3.9.3
-numpy==2.2.0
+matplotlib
+numpy>=2.2.0
 bilby
 scipy
 progressbar
@@ -17,7 +17,7 @@ asimov
 pesummary
 nessai
 elk-waveform
-gpytorch==1.0.1
-torch==2.5.1
-torchvision==0.5.0
+gpytorch>=1.0.1
+torch>=2.5.1
+torchvision>=0.5.0
 bilby_pipe

tests/test_inference_uncertain.py

@@ -43,6 +43,7 @@ def setUp(self):
     def test_simple_inject(self):
         make_injection(waveform=IMRPhenomPv2,
                        injection_parameters={"mass_ratio": 0.6,
+                                             "gpstime": 1000,
                                              "total_mass": 60 * u.solMass},
                        detectors={"AdvancedLIGOHanford": "AdvancedLIGO"}
                        )
@@ -51,6 +52,7 @@ def test_simple_inject(self):
     def test_multiple_inject(self):
         make_injection(waveform=IMRPhenomPv2,
                        injection_parameters={"mass_ratio": 0.6,
+                                             "gpstime": 1000,
                                              "total_mass": 60 * u.solMass},
                        detectors={"AdvancedLIGOHanford": "AdvancedLIGO",
                                   "AdvancedLIGOLivingston": "AdvancedLIGO"},

tests/test_injection.py

@@ -105,7 +105,6 @@ def setUp(self):
         )
 
     def test_evaluate(self):
-
         likelihoods = []
         for w in np.linspace(0.01, 0.19, 100):