Rename coord_x_err to coord_xErr

for consistency with RFC-333
lsst · Jul 2, 2018 · 9170ae2 · 9170ae2
1 parent faf8be7
commit 9170ae2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 18 deletions.
diff --git a/python/lsst/meas/algorithms/ingestIndexReferenceTask.py b/python/lsst/meas/algorithms/ingestIndexReferenceTask.py
@@ -181,7 +181,7 @@ def validate(self):
         if len(self.mag_err_column_map) > 0 and not len(self.mag_column_list) == len(self.mag_err_column_map):
             raise ValueError("If magnitude errors are provided, all magnitudes must have an error column")
         if (sum(1 for col in ("pm_ra_name", "pm_dec_name", "epoch_name") if getattr(self, col) is not None)
-            not in (0, 3)):
+                not in (0, 3)):
             raise ValueError("Only all or none of pm_ra_name, pm_dec_name and epoch_name may be specified")
         if (self.pm_ra_err_name is not None) != (self.pm_dec_err_name is not None):  # XOR
             raise ValueError("Only one of pm_ra_err_name and pm_dec_err_name has been specified")
@@ -281,11 +281,11 @@ def _set_errors(self, record, row, key_map):
             Map of catalog keys.
         """
         if self.config.ra_err_name is None:  # IngestIndexedReferenceConfig.validate ensures all or none
-            record.set(key_map["coord_ra_err"], 0.0)
-            record.set(key_map["coord_dec_err"], 0.0)
+            record.set(key_map["coord_raErr"], 0.0)
+            record.set(key_map["coord_decErr"], 0.0)
             return
-        record.set(key_map["coord_ra_err"], row[self.config.ra_err_name])
-        record.set(key_map["coord_dec_err"], row[self.config.dec_err_name])
+        record.set(key_map["coord_raErr"], row[self.config.ra_err_name])
+        record.set(key_map["coord_decErr"], row[self.config.dec_err_name])
 
     def _set_flags(self, record, row, key_map):
         """!Set the flags for a record.  Relies on the _flags class attribute
@@ -421,8 +421,8 @@ def add_field(name):
                 at_type = dtype[name].type
                 return schema.addField(name, at_type)
 
-        key_map["coord_ra_err"] = schema.addField("coord_ra_err", float)
-        key_map["coord_dec_err"] = schema.addField("coord_dec_err", float)
+        key_map["coord_raErr"] = schema.addField("coord_raErr", float)
+        key_map["coord_decErr"] = schema.addField("coord_decErr", float)
 
         for item in mag_column_list:
             key_map[item+'_flux'] = schema.addField(item+'_flux', float)

diff --git a/python/lsst/meas/algorithms/loadReferenceObjects.py b/python/lsst/meas/algorithms/loadReferenceObjects.py
@@ -511,8 +511,8 @@ def applyProperMotions(self, catalog, epoch):
             Catalog of positions, containing:
 
             - Coordinates, retrieved by the table's coordinate key.
-            - ``coord_ra_err`` : Error in Right Ascension (arcsec).
-            - ``coord_dec_err`` : Error in Declination (arcsec).
+            - ``coord_raErr`` : Error in Right Ascension (arcsec).
+            - ``coord_decErr`` : Error in Declination (arcsec).
             - ``pmRa`` : Proper motion in Right Ascension (mas/yr,
                 East positive)
             - ``pmRaErr`` : Error in ``pmRa`` (mas/yr), optional.
@@ -540,9 +540,9 @@ def applyProperMotions(self, catalog, epoch):
         amount = numpy.hypot(motionRa, motionDec)  # arcsec
         for record, aa, bb in zip(catalog, amount, bearing):
             record.set(coordKey, record.get(coordKey).offset(bb*lsst.geom.radians, aa*lsst.geom.arcseconds))
-        if "coord_ra_err" in catalog.schema:
-            catalog["coord_ra_err"] = numpy.hypot(catalog["coord_ra_err"],
-                                                  catalog[self._properMotionColumns.raErr]*arcsecScale)
-        if "coord_dec_err" in catalog.schema:
-            catalog["coord_dec_err"] = numpy.hypot(catalog["coord_dec_err"],
-                                                   catalog[self._properMotionColumns.decErr]*arcsecScale)
+        if "coord_raErr" in catalog.schema:
+            catalog["coord_raErr"] = numpy.hypot(catalog["coord_raErr"],
+                                                catalog[self._properMotionColumns.raErr]*arcsecScale)
+        if "coord_decErr" in catalog.schema:
+            catalog["coord_decErr"] = numpy.hypot(catalog["coord_decErr"],
+                                                 catalog[self._properMotionColumns.decErr]*arcsecScale)