Changeset 42018 for branches/eam_branches/ipp-20211108/Ohana/src/libdvo

Timestamp:

Feb 7, 2022, 10:56:09 AM (4 years ago)

Author:

eugene

Message:

fixing UKIDSS transformations; adding measure->extID accessor

Location:

branches/eam_branches/ipp-20211108/Ohana/src/libdvo

Files:

• include/dvodb.h (modified) (2 diffs)
• src/dbExtractMeasures.c (modified) (2 diffs)
• src/dbFields.c (modified) (1 diff)

branches/eam_branches/ipp-20211108/Ohana/src/libdvo/include/dvodb.h

@@ -240 +240 @@
       MEAS_OBJ_ID, 
       MEAS_CAT_ID, 
+      MEAS_EXT_ID, 
       MEAS_IMAGE_ID, 
       MEAS_PSF_QF, 
@@ -248 +249 @@
       MEAS_CR_NSIGMA, 
       MEAS_EXT_NSIGMA, 
-      MEAS_EXTERN_ID,
+      MEAS_IMAGE_EXTERN_ID, // return image.externID
       MEAS_EXPNAME_AS_INT,
       MEAS_MCAL_OFFSET_PSF, // make this a dvoMagOption?

branches/eam_branches/ipp-20211108/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -696 +696 @@
       value.Int = measure[0].imageID;
       break;
+    case MEAS_EXT_ID: /* OK */
+      value.Int = measure[0].extID;
+      break;
     case MEAS_PSF_QF: /* OK */
       value.Flt = measure[0].psfQF;
@@ -714 +717 @@
       value.Flt = measure[0].extNsigma;
       break;
-    case MEAS_EXTERN_ID: /* OK */
+    case MEAS_IMAGE_EXTERN_ID: /* OK */
       if (REMOTE_CLIENT) {
         ImageMetadata *image = MatchImageMetadataDVO (measure[0].imageID);

branches/eam_branches/ipp-20211108/Ohana/src/libdvo/src/dbFields.c

@@ -603 +603 @@
   if (!strcasecmp (fieldName, "CATID"))          ESCAPE (MEAS_CAT_ID,         OPIHI_INT);
   if (!strcasecmp (fieldName, "IMAGEID"))        ESCAPE (MEAS_IMAGE_ID,       OPIHI_INT);
-  if (!strcasecmp (fieldName, "EXTERNID"))       ESCAPE (MEAS_EXTERN_ID,      OPIHI_INT);
+  if (!strcasecmp (fieldName, "IMAGE_EXTERN_ID")) ESCAPE (MEAS_IMAGE_EXTERN_ID, OPIHI_INT);
+  if (!strcasecmp (fieldName, "IMAGE_EXT_ID"))    ESCAPE (MEAS_IMAGE_EXTERN_ID, OPIHI_INT);
+  if (!strcasecmp (fieldName, "EXTERNID"))       ESCAPE (MEAS_EXT_ID,         OPIHI_INT);
+  if (!strcasecmp (fieldName, "EXT_ID"))         ESCAPE (MEAS_EXT_ID,         OPIHI_INT);
   if (!strcasecmp (fieldName, "EXPNAME"))        ESCAPE (MEAS_EXPNAME_AS_INT, OPIHI_INT);
   if (!strcasecmp (fieldName, "PSF_QF"))         ESCAPE (MEAS_PSF_QF,         OPIHI_FLT);