Changeset 39643

Timestamp:

Jul 31, 2016, 12:04:20 PM (10 years ago)

Author:

eugene

Message:

fix double-free of images table when all images are used; for full overlap, require images to be completely contained by extracted region

Location:

trunk/Ohana/src/relphot

Files:

• include/relphot.h (modified) (1 diff)
• src/ImageOps.c (modified) (4 diffs)
• src/relphot_client.c (modified) (1 diff)
• src/relphot_images.c (modified) (1 diff)
• src/relphot_objects.c (modified) (1 diff)
• src/relphot_parallel_images.c (modified) (1 diff)
• src/relphot_parallel_regions.c (modified) (1 diff)
• src/select_images.c (modified) (4 diffs)

trunk/Ohana/src/relphot/include/relphot.h

@@ -618 +618 @@
 
 void relphot_free (SkyTable *sky, SkyList *skylist);
-void freeImages (int freeImageData);
+void freeImages (char *dbImagePtr);
 void relphot_client_free (SkyTable *sky, SkyList *skylist);
 void BrightCatalogFree (BrightCatalog *bcatalog);

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -269 +269 @@
 }
 
-void freeImages (int freeImageData) {
-
-  if (freeImageData) FREE (image);
+void freeImages (char *dbImagePtr) {
+
   FREE (LineNumber);
 
@@ -280 +279 @@
   FREE (projectID);
   FREE (skycellID);
+
+  // we call gfits_db_free as well as this function.  sometimes those point at the same
+  // memory location, in which case we should only do the free once.
+  if ((void *) dbImagePtr != (void *) image) free (image);
 
   free_astrom_table();
@@ -662 +665 @@
     // only freeze the gpc1 chips
     if (FREEZE_IMAGES && isGPC1chip(image[i].photcode)) continue;
+    if (image[i].photcode == 0) continue; // skip the PHU images
 
     // UBERCAL image: if this is an ubercal image, set minUbercalDist to 0:
@@ -674 +678 @@
     off_t Nref = 0;  // total number of reference stars on the image
     int Nbright = 0; // number of stars to measure the bright-end scatter
+
+    if (N_onImage[i] == 0) {
+      fprintf (stderr, "image missing detections? %s %d "OFF_T_FMT"\n", image[i].name, image[i].nstar, N_onImage[i]);
+      continue;
+    }
 
     for (j = 0; j < N_onImage[i]; j++) {

trunk/Ohana/src/relphot/src/relphot_client.c

@@ -83 +83 @@
       FlatCorrectionTable *flatcorr = NULL;
       reload_catalogs (skylist, flatcorr, HOST_ID, HOSTDIR);
-      freeImages (TRUE);
+      freeImages ((char *)image);
       free (image);
       client_logger_message ("updated catalogs\n");

trunk/Ohana/src/relphot/src/relphot_images.c

@@ -263 +263 @@
   }
   dvo_image_unlock (&db); 
+
+  freeImages (db.ftable.buffer);
   gfits_db_free (&db);
-  freeImages (TRUE);
 
   return TRUE;

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -182 +182 @@
   }
 
+  freeImages(db.ftable.buffer);
   gfits_db_free (&db);
-  freeImages(TRUE);
 
   return (TRUE);

trunk/Ohana/src/relphot/src/relphot_parallel_images.c

@@ -170 +170 @@
   freeMosaicBins (Ncatalog, TRUE);
   freeGridBins (Ncatalog);
-  freeImages(TRUE);
+  freeImages((char *)image);
 
   SkyListFree(skylist);

trunk/Ohana/src/relphot/src/relphot_parallel_regions.c

@@ -88 +88 @@
   MARKTIME ("finished relphot -parallel-regions: %f sec total\n", dtime);
 
+  freeImages(db.ftable.buffer);
   gfits_db_free (&db);
-  freeImages(FALSE);
 
   SkyListFree(skylist);

trunk/Ohana/src/relphot/src/select_images.c

@@ -46 +46 @@
   double DmaxSkyRegion = region[0].Dmax;
 
-  double dD = 5.0;
+  double dD = CALIBRATE_STACKS_AND_WARPS ? 0.5 : 5.0;
   double dR = dD / cos(RAD_DEG*DminSkyRegion);
   RminSkyRegion -= dR;
@@ -80 +80 @@
     }
   }
-
-# if (0)
-  // XXX quick test of the dec bands:
-  FILE *fout = fopen ("dec.bands.dat", "w");
-  for (i = 0; i < NDecBands; i++) {
-    fprintf (fout, "%d %f : %f - %f\n", (int) i, dDecBand * i - 90.0, RminBand[i], RmaxBand[i]);
-  }
-  fclose (fout);
-# endif
 
   SkyRegionCoords *skycoords = NULL;
@@ -168 +159 @@
     }
 
-    // fprintf (ftest, "%f %f : %f %f : %d %d\n", RminImage, RmaxImage, DminImage, DmaxImage, timage[i].tzero, timage[i].photcode);
-
     // check that this image is even in range of the searched region
-    if (DminImage > DmaxSkyRegion) continue;
-    if (DmaxImage < DminSkyRegion) continue;
-    
-    // the sky region RA is defined to be 0 - 360.0
-    if (RminImage > RmaxSkyRegion) continue;
-    if (RmaxImage < RminSkyRegion) continue;
-
+    if (USE_FULL_OVERLAP) {
+      // for full overlap, the image must be completely inside the region of interest
+      if (DmaxImage > DmaxSkyRegion) continue;
+      if (DminImage < DminSkyRegion) continue;
+      
+      // the sky region RA is defined to be 0 - 360.0
+      if (RmaxImage > RmaxSkyRegion) continue;
+      if (RminImage < RminSkyRegion) continue;
+    } else {
+      if (DminImage > DmaxSkyRegion) continue;
+      if (DmaxImage < DminSkyRegion) continue;
+      
+      // the sky region RA is defined to be 0 - 360.0
+      if (RminImage > RmaxSkyRegion) continue;
+      if (RmaxImage < RminSkyRegion) continue;
+    }
+      
     // the above checks are only valid for the outermost region.  however, at a given
     // declination, the range of RA is limited by the actual catalog boundaries
@@ -204 +203 @@
       }
     }
+
+    // fprintf (ftest, "%f %f : %f %f : %d %d\n", RminImage, RmaxImage, DminImage, DmaxImage, timage[i].tzero, timage[i].photcode);
 
     // image overlaps region, keep it