Make gate-and-inpainting starting time precise

pycbc/inference/models/marginalized_gaussian_noise.py

@@ -229,7 +229,7 @@ def __init__(self, variable_params,
                 generator_class=generator.FDomainDetFrameTwoPolNoRespGenerator,
                 gates=self.gates, **kwargs['static_params'])
         else:
-            # create a waveform generator for each ifo respestively
+            # create a waveform generator for each ifo respectively
             self.waveform_generator = {}
             for det in self.data:
                 self.waveform_generator[det] = create_waveform_generator(
@@ -386,7 +386,7 @@ def __init__(self, variable_params, data, low_frequency_cutoff, psds=None,
                 generator_class=generator.FDomainDetFrameTwoPolGenerator,
                 gates=self.gates, **kwargs['static_params'])
         else:
-            # create a waveform generator for each ifo respestively
+            # create a waveform generator for each ifo respectively
             self.waveform_generator = {}
             for det in self.data:
                 self.waveform_generator[det] = create_waveform_generator(

pycbc/strain/gate.py

@@ -168,16 +168,16 @@ def gate_and_paint(data, lindex, rindex, invpsd, copy=True):
     # Copy the data and zero inside the hole
     if copy:
         data = data.copy()
-    data[lindex:rindex] = 0
+    data[lindex:rindex+1] = 0
 
     # get the over-whitened gated data
     tdfilter = invpsd.astype('complex').to_timeseries() * invpsd.delta_t
     owhgated_data = (data.to_frequencyseries() * invpsd).to_timeseries()
 
     # remove the projection into the null space
-    proj = linalg.solve_toeplitz(tdfilter[:(rindex - lindex)],
-                                 owhgated_data[lindex:rindex])
-    data[lindex:rindex] -= proj
+    proj = linalg.solve_toeplitz(tdfilter[:(rindex + 1 - lindex)],
+                                 owhgated_data[lindex:rindex+1])
+    data[lindex:rindex+1] -= proj
     data.projslc = (lindex, rindex)
     data.proj = proj
     return data

pycbc/types/timeseries.py

@@ -595,15 +595,31 @@ def gate(self, time, window=0.25, method='taper', copy=True,
             # Uses the hole-filling method of
             # https://arxiv.org/pdf/1908.05644.pdf
             from pycbc.strain.gate import gate_and_paint
+            from pycbc.waveform.utils import apply_fd_time_shift
             if invpsd is None:
                 # These are some bare minimum settings, normally you
                 # should probably provide a psd
                 invpsd = 1. / self.filter_psd(self.duration/32, self.delta_f, 0)
             lindex = int((time - window - self.start_time) / self.delta_t)
-            rindex = lindex + int(2 * window / self.delta_t)
+            rindex = int((time + window - self.start_time) / self.delta_t)
             lindex = lindex if lindex >= 0 else 0
             rindex = rindex if rindex <= len(self) else len(self)
-            return gate_and_paint(data, lindex, rindex, invpsd, copy=False)
+            # shift data such that gate_end_time lands on a specific data sample
+            fdata = data.to_frequencyseries()
+            rindex_time = data.sample_times[rindex]
+            offset = rindex_time - (time + window)
+            fdata = apply_fd_time_shift(fdata, offset + fdata.epoch, copy=copy)
+            # gate and paint in time domain
+            data = fdata.to_timeseries()
+            data = gate_and_paint(data, lindex, rindex, invpsd, copy=copy)
+            # shift back to the original time
+            fdata = data.to_frequencyseries()
+            fdata = apply_fd_time_shift(fdata, -offset + fdata.epoch, copy=copy)
+            tdata = fdata.to_timeseries()
+            # fill in projslc information
+            tdata.projslc = data.projslc
+            tdata.proj = data.proj
+            return tdata
         elif method == 'hard':
             tslice = data.time_slice(time - window, time + window)
             tslice[:] = 0