Merge pull request #210 from lsst/tickets/DM-24924

DM-24924: Update telescope names

python/lsst/obs/lsst/translators/comCam.py

@@ -15,6 +15,7 @@
 import logging
 
 from .lsstCam import LsstCamTranslator
+from .lsst import SIMONYI_TELESCOPE
 
 log = logging.getLogger(__name__)
 
@@ -69,11 +70,11 @@ def can_translate(cls, header, filename=None):
         if "INSTRUME" in header and "TELESCOP" in header:
             telescope = header["TELESCOP"]
             instrument = header["INSTRUME"].lower()
-            if instrument == "comcam" and telescope == "LSST":
+            if instrument == "comcam" and telescope in (SIMONYI_TELESCOPE, "LSST"):
                 return True
             telcode = header.get("TELCODE", None)
             # Some lab data reports that it is LSST_CAMERA
-            if telcode == "CC" and telescope == "LSST":
+            if telcode == "CC" and telescope in (SIMONYI_TELESCOPE, "LSST"):
                 return True
 
         return False

python/lsst/obs/lsst/translators/latiss.py

@@ -103,10 +103,8 @@ class LatissTranslator(LsstBaseTranslator):
     """Supports the LATISS instrument."""
 
     _const_map = {
-        # LATISS is not yet attached to a telescope so many translations
-        # are null.
         "instrument": "LATISS",
-        "telescope": "LSSTAuxTel",
+        "telescope": "Rubin Auxiliary Telescope",
         "detector_group": _DETECTOR_GROUP_NAME,
         "detector_num": 0,
         "detector_name": _DETECTOR_NAME,  # Single sensor

python/lsst/obs/lsst/translators/lsst.py

@@ -10,8 +10,9 @@
 
 """Metadata translation support code for LSST headers"""
 
-__all__ = ("ROLLOVERTIME", "TZERO", "LSST_LOCATION", "read_detector_ids",
-           "compute_detector_exposure_id_generic", "LsstBaseTranslator")
+__all__ = ("ROLLOVERTIME", "TZERO", "SIMONYI_LOCATION", "read_detector_ids",
+           "compute_detector_exposure_id_generic", "LsstBaseTranslator",
+           "SIMONYI_TELESCOPE")
 
 import os.path
 import yaml
@@ -43,7 +44,10 @@
 GROUP_RE = re.compile(r"^(\d\d\d\d\-\d\d\-\d\dT\d\d:\d\d:\d\d)\.(\d\d\d)(?:[\+#](\d+))?$")
 
 # LSST Default location in the absence of headers
-LSST_LOCATION = EarthLocation.from_geodetic(-70.749417, -30.244639, 2663.0)
+SIMONYI_LOCATION = EarthLocation.from_geodetic(-70.749417, -30.244639, 2663.0)
+
+# Name of the main survey telescope
+SIMONYI_TELESCOPE = "Simonyi Survey Telescope"
 
 obs_lsst_packageDir = getPackageDir("obs_lsst")
 
@@ -155,7 +159,7 @@ class LsstBaseTranslator(FitsTranslator):
     """Maximum number of detectors to use when calculating the
     detector_exposure_id."""
 
-    _DEFAULT_LOCATION = LSST_LOCATION
+    _DEFAULT_LOCATION = SIMONYI_LOCATION
     """Default telescope location in absence of relevant FITS headers."""
 
     @classmethod

python/lsst/obs/lsst/translators/lsstCam.py

@@ -18,7 +18,7 @@
 # from astro_metadata_translator import cache_translation
 from astro_metadata_translator.translators.helpers import is_non_science
 
-from .lsst import LsstBaseTranslator
+from .lsst import LsstBaseTranslator, SIMONYI_TELESCOPE
 
 log = logging.getLogger(__name__)
 
@@ -49,7 +49,7 @@ class LsstCamTranslator(LsstBaseTranslator):
     """Supports the lsstCam instrument."""
 
     _const_map = {
-        "telescope": "LSST",
+        "telescope": SIMONYI_TELESCOPE,
         # Migrate these to full translations once test data appears that
         # includes them
         "boresight_rotation_coord": "unknown",

python/lsst/obs/lsst/translators/lsst_ucdcam.py

@@ -43,7 +43,7 @@ class LsstUCDCamTranslator(LsstBaseTranslator):
 
     _const_map = {
         # TS8 is not attached to a telescope so many translations are null.
-        "telescope": "LSST",
+        "telescope": None,
         "location": None,
         "boresight_rotation_coord": None,
         "boresight_rotation_angle": None,

python/lsst/obs/lsst/translators/lsstsim.py

@@ -19,7 +19,7 @@
 from astropy.coordinates import AltAz
 from astro_metadata_translator import cache_translation
 
-from .lsst import LsstBaseTranslator, LSST_LOCATION
+from .lsst import LsstBaseTranslator, SIMONYI_LOCATION, SIMONYI_TELESCOPE
 
 log = logging.getLogger(__name__)
 
@@ -48,10 +48,10 @@ def to_telescope(self):
         # Docstring will be inherited. Property defined in properties.py
         telescope = None
         if self.is_key_ok("OUTFILE") and self._header["OUTFILE"].startswith("lsst"):
-            telescope = "LSST"
+            telescope = SIMONYI_TELESCOPE
             self._used_these_cards("OUTFILE")
         elif "LSST_NUM" in self._header:
-            telescope = "LSST"
+            telescope = SIMONYI_TELESCOPE
             self._used_these_cards("LSST_NUM")
         return telescope
 
@@ -61,8 +61,8 @@ def to_location(self):
         location = None
         # In theory simulated files might not be for LSST
         tel = self.to_telescope()
-        if tel == "LSST":
-            location = LSST_LOCATION
+        if tel == SIMONYI_TELESCOPE:
+            location = SIMONYI_LOCATION
         else:
             # Try standard FITS headers
             try:

python/lsst/obs/lsst/translators/ts3.py

@@ -39,7 +39,7 @@ class LsstTS3Translator(LsstBaseTranslator):
 
     _const_map = {
         # TS3 is not attached to a telescope so many translations are null.
-        "telescope": "LSST",
+        "telescope": None,
         "location": None,
         "boresight_rotation_coord": None,
         "boresight_rotation_angle": None,

python/lsst/obs/lsst/translators/ts8.py

@@ -34,7 +34,7 @@ class LsstTS8Translator(LsstBaseTranslator):
 
     _const_map = {
         # TS8 is not attached to a telescope so many translations are null.
-        "telescope": "LSST",
+        "telescope": None,
         "location": None,
         "boresight_rotation_coord": None,
         "boresight_rotation_angle": None,