update tests

examples/detector/loc.py

@@ -4,10 +4,10 @@
 # along with a longer name. Note that some of these are not physical detectors
 # but may be useful for testing or study purposes
 
-for abv, long_name in get_available_detectors():
+for abv in get_available_detectors():
     d = Detector(abv)
 
     # Note that units are all in radians
-    print("{} {} Latitude {} Longitude {}".format(long_name, abv,
+    print("{} Latitude {} Longitude {}".format(abv,
                                                   d.latitude,
                                                   d.longitude))

pycbc/detector.py

@@ -50,7 +50,9 @@ def gmst_accurate(gps_time):
 
 def get_available_detectors():
     """ List the available detectors """
-    return list(_ground_detectors.keys())
+    dets = list(_ground_detectors.keys())
+    dets += [a[0] for a in get_available_lal_detectors()]
+    return dets
 
 def get_available_lal_detectors():
     """Return list of detectors known in the currently sourced lalsuite.
@@ -204,7 +206,7 @@ def __init__(self, detector_name, reference_time=1126259462.0):
         using a slower but higher precision method.
         """
         self.name = str(detector_name)
-        
+
         lal_detectors = [pfx for pfx, name in get_available_lal_detectors()]
         if detector_name in get_available_detectors():
             self.info = _ground_detectors[detector_name]

test/test_detector.py

@@ -38,7 +38,7 @@
 class TestDetector(unittest.TestCase):
     def setUp(self):
         self.d = [det.Detector(ifo)
-                  for ifo, name in det.get_available_detectors()]
+                  for ifo in det.get_available_detectors()]
 
         # not distributed sanely, but should provide some good coverage
         N = 1000

test/test_injection.py

@@ -85,7 +85,6 @@ def fill_sim_inspiral_row(self, row):
 class TestInjection(unittest.TestCase):
     def setUp(self):
         available_detectors = get_available_detectors()
-        available_detectors = [a[0] for a in available_detectors]
         self.assertTrue('H1' in available_detectors)
         self.assertTrue('L1' in available_detectors)
         self.assertTrue('V1' in available_detectors)