Use SkyGrid functions to write the HDF5 file and fix error in angular convention

bin/pycbc_make_sky_grid

@@ -20,7 +20,7 @@ import pycbc
 from pycbc.detector import Detector
 from pycbc.io.hdf import HFile
 from pycbc.types import angle_as_radians
-
+from pycbc.tmpltbank import sky_grid
 
 def spher_to_cart(sky_points):
     """Convert spherical coordinates to cartesian coordinates."""
@@ -62,7 +62,7 @@ parser.add_argument(
     nargs="+",
     type=str,
     required=True,
-    help="List of instruments to analyze.",
+    help="List of instuments to analyze.",
 )
 parser.add_argument(
     '--sky-error',
@@ -165,23 +165,16 @@ spher = cart_to_spher(rota)
 
 # Calculate the time delays between the Earth center
 # and each detector for each sky point
-time_delays = [
-    [
-        detectors[i].time_delay_from_earth_center(
-            spher[j][0], spher[j][1], args.trigger_time
+sky_grid = sky_grid.SkyGrid(
+        spher[:, 0], spher[:, 1], args.instruments, args.trigger_time
         )
-        for j in range(len(spher))
-    ]
-    for i in range(len(detectors))
-]
+time_delays = sky_grid.calculate_time_delays()
+
+extra_attributes = {
+    'trigger_ra': args.ra,
+    'trigger_dec': args.dec,
+    'sky_error': args.sky_error,
+    'timing_uncertainty': args.timing_uncertainty
+}
 
-with HFile(args.output, 'w') as hf:
-    hf['ra'] = spher[:, 0]
-    hf['dec'] = spher[:, 1]
-    hf['trigger_ra'] = [args.ra]
-    hf['trigger_dec'] = [args.dec]
-    hf['sky_error'] = [args.sky_error]
-    hf['trigger_time'] = [args.trigger_time]
-    hf['timing_uncertainty'] = [args.timing_uncertainty]
-    hf['instruments'] = [d for d in args.instruments]
-    hf['time_delays'] = time_delays
+sky_grid.write_to_file(args.output, extra_attributes)

pycbc/tmpltbank/sky_grid.py

@@ -91,13 +91,17 @@ def read_from_file(cls, path):
             ref_gps_time = hf.attrs['ref_gps_time']
         return cls(ra, dec, detectors, ref_gps_time)
 
-    def write_to_file(self, path):
+    def write_to_file(self, path, extra_attrs=None, extra_datasets=None):
         """Writes a sky grid to an HDF5 file."""
         with h5py.File(path, 'w') as hf:
             hf['ra'] = self.ras
             hf['dec'] = self.decs
             hf.attrs['detectors'] = self.detectors
             hf.attrs['ref_gps_time'] = self.ref_gps_time
+            for attribute in (extra_attrs or {}):
+                hf.attrs[attribute] = extra_attrs[attribute]
+            for datasets in (extra_datasets or {}):
+                hf[datasets] = extra_datasets[datasets]
 
     def calculate_antenna_patterns(self):
         """Calculate the antenna pattern functions at each point in the grid