Changeset 28989

Timestamp:

Aug 20, 2010, 11:04:39 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/eam_branches/ipp-20100621/Ohana/src/opihi

Files:

• dvo/ImageSelection.c (modified) (2 diffs)
• dvo/LoadImages.c (modified) (3 diffs)
• dvo/dbExtractMeasures.c (modified) (3 diffs)
• dvo/dbFields.c (modified) (1 diff)
• dvo/gimages.c (modified) (2 diffs)
• dvo/images.c (modified) (1 diff)
• dvo/imdense.c (modified) (1 diff)
• dvo/imextract.c (modified) (1 diff)
• dvo/mextract.c (modified) (2 diffs)
• dvo/photometry.c (modified) (2 diffs)
• include/dvoshell.h (modified) (2 diffs)

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/ImageSelection.c

@@ -38 +38 @@
 /* free loaded images */
 void FreeImageSelection () {
-  if (image != NULL) free (image);
+  if (image != NULL) FreeImages(image);
   if (subset != NULL) free (subset);
   image = NULL;
@@ -45 +45 @@
 }
 
-Image *MatchImage (unsigned int time, short int source) { 
+Image *MatchImage (unsigned int time, short int source, unsigned int imageID) { 
 
   int m;
 
-  m = match_image_subset (image, subset, Nsubset, time, source);
+  if ((imageID != 0) && (imageID < Nimage)) {
+    m = (int) imageID - 1;
+  } else {
+    m = match_image_subset (image, subset, Nsubset, time, source);
+  }
   if (m == -1) return (NULL);
   if (!FindMosaicForImage (image, Nimage, m)) return (NULL);

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/LoadImages.c

@@ -1 +1 @@
 # include "dvoshell.h"
+
+// XXX: Maybe make this a command line option
+int dvoUseImageCache = 1;
+
+static char *lastFilename = NULL;
+static time_t lastModified = 0;
+static Image *imageCache = NULL;
+static off_t cacheNimage = 0;
+
+static time_t getLastModified(char *filename);
 
 Image *LoadImages (off_t *Nimage) {
@@ -12 +22 @@
   catdir = GetCATDIR ();
   sprintf (filename, "%s/Images.dat", catdir);
+
+  if (lastFilename) {
+    if (dvoUseImageCache && !strcmp(lastFilename, filename)) {
+      // Make sure the file hasn't changed since we loaded it
+      if (getLastModified(filename) == lastModified) {
+        *Nimage = cacheNimage;
+        return  imageCache;
+      }
+    }
+    free(lastFilename);
+    lastFilename = NULL;
+    free(imageCache);
+    imageCache = NULL;
+    cacheNimage = 0;
+    lastModified = 0;
+  }
+
 
   gfits_db_init (&db);
@@ -40 +67 @@
   if (!image) {
     fprintf (stderr, "ERROR: failed to read images\n");
-    exit (2);
+    return (NULL);
+  }
+  if (dvoUseImageCache && image) {
+    cacheNimage = *Nimage;
+    imageCache = image;
+    lastFilename = strdup(filename);
+    lastModified = getLastModified(filename);
   }
   return (image);
 }
+
+static time_t getLastModified(char *filename) {
+  struct stat statbuf;
+  if (!stat(filename, &statbuf)) {
+    return statbuf.st_mtime;
+  } else {
+    return 0;
+  }
+}
+
+void FreeImages(Image *images) {
+  if (!dvoUseImageCache && (images != NULL)) {
+    free(images);
+  } else {
+    // defer free until next LoadImages with a different or modified Images.dat
+  }
+}
+

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -358 +358 @@
         ra  = average[0].R - measure[0].dR / 3600.0;
         dec = average[0].D - measure[0].dD / 3600.0;
-        image = MatchImage (measure[0].t, measure[0].photcode);
+        image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
         if (image == NULL) break;
         RD_to_XY (&x, &y, ra, dec, &image[0].coords);
@@ -374 +374 @@
         ra  = average[0].R - measure[0].dR / 3600.0;
         dec = average[0].D - measure[0].dD / 3600.0;
-        image = MatchImage (measure[0].t, measure[0].photcode);
+        image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
         if (image == NULL) break;
         RD_to_XY (&x, &y, ra, dec, &image[0].coords);
@@ -440 +440 @@
       value.Flt = measure[0].extNsigma;
       break;
+    case MEAS_EXTERN_ID: /* OK */
+      {
+        Image *image;
+        image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
+        if (image == NULL) break;
+        value.Int = image->externID;
+      }
+      break;
 
       // add the star/galaxy sep -- 

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/dbFields.c

@@ -212 +212 @@
   if (!strcasecmp (fieldName, "SKY"))            ESCAPE (MEAS_SKY,            MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "SKY_ERR"))        ESCAPE (MEAS_dSKY,           MAG_NONE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "externID"))       ESCAPE (MEAS_EXTERN_ID,      MAG_NONE, OPIHI_INT);
 
   // for words that don't parse, try a photcode

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/gimages.c

@@ -235 +235 @@
     sprintf (name, "IMAGEname:%d", Nfound);
     set_str_variable (name, image[i].name);
+    sprintf (name, "IMAGEphotcode:%d", Nfound);
+    set_int_variable (name, image[i].photcode);
     Nfound ++;
     free (date);
@@ -243 +245 @@
   set_int_variable ("IMAGEccd:n", Nfound);
   set_int_variable ("IMAGEname:n", Nfound);
-
-  free (image);
+  set_int_variable ("IMAGEphotcode:n", Nfound);
+
+  FreeImages (image);
   free (subset);
 

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/images.c

@@ -319 +319 @@
   free (Xvec.elements.Flt);
   free (Yvec.elements.Flt);
-  free (image);
+  FreeImages (image);
   return (TRUE);
 

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/imdense.c

@@ -70 +70 @@
   free (Xvec.elements.Flt);
   free (Yvec.elements.Flt);
-  free (image);
+  FreeImages (image);
   return (TRUE);
 

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/imextract.c

@@ -137 +137 @@
 
   // free (subset);
-  free (image);
+  FreeImages (image);
 
   if (vec) free (vec);

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/mextract.c

@@ -88 +88 @@
   mosaicMode = FALSE;
   for (i = 0; !loadImages && (i < Nfields); i++) {
-    if (fields[i].ID == MEAS_XCCD) loadImages = TRUE;
-    if (fields[i].ID == MEAS_YCCD) loadImages = TRUE;
+    if (fields[i].ID == MEAS_XCCD) loadImages = TRUE;   // Are these still needed? Xccd and Yccd are in measurement
+    if (fields[i].ID == MEAS_YCCD) loadImages = TRUE;   // and dbExtractMeasures doesn't look at the image for these
     if (fields[i].ID == MEAS_XMOSAIC) loadImages = mosaicMode = TRUE;
     if (fields[i].ID == MEAS_YMOSAIC) loadImages = mosaicMode = TRUE;
+    if (fields[i].ID == MEAS_EXTERN_ID) loadImages = mosaicMode = TRUE;
   }
   if (loadImages && !SetImageSelection (mosaicMode, selection)) goto escape;
@@ -305 +306 @@
     gprint (GP_ERR, "  catID : catalog ID (32 bit)\n");
     gprint (GP_ERR, "  imageID : ID of source image (32 bit)\n");
+    gprint (GP_ERR, "  externID : externID of source image (32 bit)\n");
     return (FALSE);
   }

branches/eam_branches/ipp-20100621/Ohana/src/opihi/dvo/photometry.c

@@ -1178 +1178 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      image = MatchImage (measure[0].t, measure[0].photcode);
+      image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
       if (image == NULL) break;
       RD_to_XY (&x, &y, ra, dec, &image[0].coords);
@@ -1191 +1191 @@
       ra  = average[0].R - measure[0].dR / 3600.0;
       dec = average[0].D - measure[0].dD / 3600.0;
-      image = MatchImage (measure[0].t, measure[0].photcode);
+      image = MatchImage (measure[0].t, measure[0].photcode, measure[0].imageID);
       if (image == NULL) break;
       RD_to_XY (&x, &y, ra, dec, &image[0].coords);

branches/eam_branches/ipp-20100621/Ohana/src/opihi/include/dvoshell.h

@@ -121 +121 @@
       MEAS_CR_NSIGMA, 
       MEAS_EXT_NSIGMA, 
+      MEAS_EXTERN_ID,
 };
 
@@ -301 +302 @@
 int           InitPhotcodes         PROTO((void));
 Image        *LoadImages            PROTO((off_t *Nimage));
-Image        *MatchImage            PROTO((unsigned int time, short int source));
+void          FreeImages            PROTO((Image *images));
+Image        *MatchImage            PROTO((unsigned int time, short int source, unsigned int imageID));
 Coords       *MatchMosaic           PROTO((unsigned int time, short int source));
 int           Quality               PROTO((Measure *measure, int IsDophot));