Changeset 42075

Timestamp:

Feb 28, 2022, 12:05:28 PM (4 years ago)

Author:

eugene

Message:

add method to extract measure->extID (as well as image->externID); add Molweide projection

Location:

trunk/Ohana/src/libdvo

Files:

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

trunk/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?

trunk/Ohana/src/libdvo/include/libdvo_astro.h

@@ -27 +27 @@
   PROJ_PAR, // pseudocyl
   PROJ_ZPN, // zenithal
+  PROJ_MOL, // pseudocyl 
 } OhanaProjection;
 

trunk/Ohana/src/libdvo/src/coordops.c

@@ -266 +266 @@
     switch (proj) {
       case PROJ_AIT:
-      Z2 = (1.0 - SQ(RAD_DEG*0.25*L) - SQ(RAD_DEG*0.5*M));
-      if (Z2 < 0) return (FALSE);
-      Z = sqrt (Z2);
-      alpha = 2.0 * DEG_RAD * atan2 (RAD_DEG*0.5*Z*L, 2.0*Z2 - 1.0);
-      delta = DEG_RAD * asin (RAD_DEG*M*Z);
-      break;
-      
+        Z2 = (1.0 - SQ(RAD_DEG*0.25*L) - SQ(RAD_DEG*0.5*M));
+        if (Z2 < 0) return (FALSE);
+        Z = sqrt (Z2);
+        alpha = 2.0 * DEG_RAD * atan2 (RAD_DEG*0.5*Z*L, 2.0*Z2 - 1.0);
+        delta = DEG_RAD * asin (RAD_DEG*M*Z);
+        break;
       case PROJ_GLS:
         /* L,M in degrees, alpha,delta in degrees */
@@ -283 +282 @@
         delta = 3 * DEG_RAD * asin (M/180.0);
         break;
+      case PROJ_MOL:
+        Z = sqrt(2.0 - SQ(RAD_DEG*M));
+        alpha = M_PI*L/(2*Z);
+        double T1 = asin(RAD_DEG*M*M_SQRT1_2)/90.0 + M*Z/180.0;
+        delta = DEG_RAD*asin(T1);
       default:
         return (FALSE);
@@ -448 +452 @@
         *M = 180.0 * sin (RAD_DEG*theta/3.0);
         return (TRUE);
+      case PROJ_MOL: 
+        phi = ra - coords[0].crval1;
+        theta = dec - coords[0].crval2;
+        // given theta, solve for gamma:
+        double So = sin(theta*RAD_DEG);
+        double Go = theta;
+        if (theta > +80) { Go = theta - 10.0;}
+        if (theta < -80) { Go = theta + 10.0;}
+        for (int iter = 0; iter < 5; iter ++) {
+          double Fo = (Go / 90.0) + sin(Go*M_PI/90.0) / M_PI - So;
+          double dFdG = (1 / 90.0) + cos(Go*M_PI/90.0) / 90.0;
+          Go -= Fo / dFdG;
+        }
+        *L = 2*phi * cos(RAD_DEG*Go) * M_SQRT2 / M_PI;
+        *M = 180.0 * sin(RAD_DEG*Go) * M_SQRT2 / M_PI;
+        return (TRUE);
       default:
         return (FALSE);
@@ -1059 +1079 @@
   if (!strncmp(&ctype[4], "-GLS", 4)) return PROJ_GLS;
   if (!strncmp(&ctype[4], "-PAR", 4)) return PROJ_PAR;
+  if (!strncmp(&ctype[4], "-MOL", 4)) return PROJ_MOL;
   return PROJ_NONE;
 }
@@ -1079 +1100 @@
     case PROJ_GLS: strcpy(&ctype[4], "-GLS"); return TRUE;
     case PROJ_PAR: strcpy(&ctype[4], "-PAR"); return TRUE;
+    case PROJ_MOL: strcpy(&ctype[4], "-MOL"); return TRUE;
     case PROJ_NONE: return FALSE;
   }
@@ -1103 +1125 @@
     case PROJ_GLS:
     case PROJ_PAR:
+    case PROJ_MOL:
       return PROJ_MODE_PSEUDOCYL;
     default: 

trunk/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);

trunk/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, "EXTID"))          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);