Changeset 35263 for trunk/Ohana/src/libdvo

Timestamp:

Mar 7, 2013, 9:51:07 AM (13 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130306: addstar now can block against duplicate image IDs; mextract, mmatch now use a subset of image metadata instead of the whole table

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/Makefile (modified) (1 diff)
• src/libdvo/doc/image-searches.txt (copied) (copied from branches/eam_branches/ipp-20130306/Ohana/src/libdvo/doc/image-searches.txt )
• src/libdvo/include/dvodb.h (modified) (3 diffs)
• src/libdvo/src/ImageMetadata.c (copied) (copied from branches/eam_branches/ipp-20130306/Ohana/src/libdvo/src/ImageMetadata.c )
• src/libdvo/src/ImageMetadataSelection.c (copied) (copied from branches/eam_branches/ipp-20130306/Ohana/src/libdvo/src/ImageMetadataSelection.c )
• src/libdvo/src/ImageSelection.c (modified) (1 diff)
• src/libdvo/src/dbExtractMeasures.c (modified) (6 diffs)
• src/libdvo/src/dvosorts.c (modified) (1 diff)

trunk/Ohana/src/libdvo/Makefile

@@ -98 +98 @@
 $(SRC)/LoadImages.$(ARCH).o             \
 $(SRC)/ImageSelection.$(ARCH).o         \
+$(SRC)/ImageMetadataSelection.$(ARCH).o \
+$(SRC)/ImageMetadata.$(ARCH).o \
 $(SRC)/ImageOps.$(ARCH).o               \
 $(SRC)/match_image.$(ARCH).o            \

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

@@ -298 +298 @@
 } dbValue;
 
+typedef struct {
+  double crval1;
+  double crval2;
+  unsigned int imageID;
+  unsigned int externID;
+  unsigned int expname;
+  float Mcal;
+  float secz;
+  float Xcenter;
+  float Ycenter;
+} ImageMetadata;
+
 Image        *LoadImagesDVO         PROTO((off_t *Nimage));
 void          FreeImagesDVO         PROTO((Image *images));
@@ -346 +358 @@
 int dbExtractMeasuresInitAve (void);
 int dbExtractMeasuresInitMeas (void);
-int dbExtractMeasuresInit (void);
+int dbExtractMeasuresInit (int isRemoteClient);
 
 int dbExtractAveragesInitTransform (CoordTransformSystem target);
@@ -363 +375 @@
 #include "get_graphdata.h"
 
+ImageMetadata *ImageMetadataLoad(char *filename, off_t *nimage);
+int ImageMetadataSave(char *filename, Image *image, off_t Nimage);
+
+int SetImageMetadataSelection (char *filename);
+void FreeImageMetadataSelection ();
+ImageMetadata *MatchImageMetadataDVO (unsigned int imageID);
+Coords *MatchMosaicMetadata (unsigned int imageID);
+off_t match_image_by_ID (ImageMetadata *image, off_t Nimage, unsigned int ID);
+void sort_image_metadata (ImageMetadata *image, off_t Nimage);
+
 # endif

trunk/Ohana/src/libdvo/src/ImageSelection.c

@@ -68 +68 @@
 }
 
+Image *MatchImageDVO_old (unsigned int time, short int source, unsigned int imageID) { 
+
+  int m = -1;
+
+  if ((imageID != 0) && (imageID < Nimage)) {
+    // imageID is in range for the array of images. If the table is still in order and
+    // no images have been deleted the index of the image we are looking for will be imageID - 1
+    // If this is the case, we have it. Otherwise we'll have to go search for it below
+    int guess = (int) imageID - 1;
+    if (image[guess].imageID == imageID) {
+        m = guess;
+    }
+  } 
+  if (m == -1) {
+    m = match_image_subset (image, subset, Nsubset, time, source);
+  }
+  if (m == -1) return (NULL);
+  if (!FindMosaicForImage (image, Nimage, m)) return (NULL);
+  return (&image[m]);
+}
+
 Coords *MatchMosaic (unsigned int time, short int source) { 
 

trunk/Ohana/src/libdvo/src/dbExtractMeasures.c

@@ -14 +14 @@
 static CoordTransform *celestial_to_ecliptic = NULL;
 
+static int REMOTE_CLIENT = FALSE;
+
 static int haveGalacticAve = FALSE;
 static double GLON_AVE = 0.0;
@@ -30 +32 @@
 static double ELAT_MEAS = 0.0;
 
-int dbExtractMeasuresInit () {
+int dbExtractMeasuresInit (int isRemoteClient) {
+  REMOTE_CLIENT = isRemoteClient;
   GetTimeFormat (&TimeReference, &TimeFormat);
   return (TRUE);
@@ -335 +338 @@
       break;
     case MEAS_MEAN_AIRMASS: /* OK */
-      {
+      if (REMOTE_CLIENT) {
+        ImageMetadata *image = MatchImageMetadataDVO (measure[0].imageID);
+        if (image == NULL) break;
+        value.Flt = image[0].secz;
+      } else {
         Image *image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
         if (image == NULL) break;
         value.Flt = image[0].secz;
-        break;
-      }
+      }
+      break;
     case MEAS_AZ: /* OK */
       value.Flt = measure[0].az;
@@ -461 +468 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      mosaic = MatchMosaic (measure[0].t, measure[0].photcode);
+      mosaic = MatchMosaicMetadata (measure[0].imageID);
       if (mosaic == NULL) break;
       RD_to_XY (&x, &y, ra, dec, mosaic);
@@ -515 +522 @@
       break;
     case MEAS_EXTERN_ID: /* OK */
-      {
-        Image *image;
-        image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+      if (REMOTE_CLIENT) {
+        ImageMetadata *image = MatchImageMetadataDVO (measure[0].imageID);
         if (image == NULL) break;
         value.Int = image->externID;
+      } else {
+        Image *image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        value.Int = image[0].externID;
       }
       break;
 
     case MEAS_EXPNAME_AS_INT:
-      {
-        Image *image;
-        image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+      if (REMOTE_CLIENT) {
+        ImageMetadata *image = MatchImageMetadataDVO (measure[0].imageID);
+        if (image == NULL) break;
+        value.Int = image->expname;
+      } else {
+        Image *image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
         if (image == NULL) break;
         // XXX very crude: if this matches oNNNNgNNNNo, then convert to an int
@@ -544 +557 @@
     case MEAS_FLAT: /* OK */
       // flat = measure.Mcal - image.Mcal
-      { 
-        Image *image;
-        image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+      if (REMOTE_CLIENT) {
+        ImageMetadata *image = MatchImageMetadataDVO (measure[0].imageID);
         if (image == NULL) break;
         value.Flt = measure[0].Mcal - image[0].Mcal;
-      }
-      break;
-
+      } else {
+        Image *image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        value.Flt = measure[0].Mcal - image[0].Mcal;
+      }
+      break;
+
+      // we have measure[0].Xccd,Yccd and image[0].NX,NY.  Find the distance to the center
     case MEAS_CENTER_OFFSET: /* OK */
-      { 
-        Image *image;
-        image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
-        if (image == NULL) break;
-        
-        // we have measure[0].Xccd,Yccd and image[0].NX,NY.  Find the distance to the center
-
+      if (REMOTE_CLIENT) {
+        ImageMetadata *image = MatchImageMetadataDVO (measure[0].imageID);
+        if (image == NULL) break;
+        float Xcenter = image[0].Xcenter;
+        float Ycenter = image[0].Ycenter;
+        float distance = hypot (measure[0].Xccd - Xcenter, measure[0].Yccd - Ycenter);
+        value.Flt = distance;
+      } else {
+        Image *image = MatchImageDVO (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
         // XXX we may hypotetically have images with -NX to +NX here (eg, projection center), but 
         // we do not get a detection from that type of image

trunk/Ohana/src/libdvo/src/dvosorts.c

@@ -23 +23 @@
 
   OHANA_SORT (N, COMPARE, SWAPFUNC);
+
+# undef SWAPFUNC
+# undef COMPARE
+
+}
+
+/* sort ImageMetadata array by image[i].imageID */
+void sort_image_metadata (ImageMetadata *image, off_t Nimage) {
+
+# define SWAPFUNC(A,B){ ImageMetadata tmp; tmp = image[A]; image[A] = image[B]; image[B] = tmp; }
+# define COMPARE(A,B)(image[A].imageID < image[B].imageID)
+
+  OHANA_SORT (Nimage, COMPARE, SWAPFUNC);
 
 # undef SWAPFUNC