Changeset 39580 for trunk

Timestamp:

May 26, 2016, 1:35:27 PM (10 years ago)

Author:

eugene

Message:

check for bad warp->imageID values based on the relative coordinates

Location:

trunk/Ohana/src/relastro

Files:

• include/relastro.h (modified) (2 diffs)
• src/ImageOps.c (modified) (2 diffs)
• src/RepairWarpMeasures.c (modified) (3 diffs)
• src/RepairWarps.c (modified) (1 diff)
• src/args.c (modified) (2 diffs)
• src/relastro.c (modified) (2 diffs)
• src/relastro_client.c (modified) (2 diffs)
• src/relastro_images.c (modified) (2 diffs)
• src/relastro_parallel_images.c (modified) (1 diff)
• src/relastro_parallel_regions.c (modified) (1 diff)

trunk/Ohana/src/relastro/include/relastro.h

@@ -317 +317 @@
 int    USE_ICRF_POLE;
 
+int    USE_IMAGE_COORDS_FOR_REPAIR;
 int    USE_ALL_IMAGES;
 
@@ -453 +454 @@
 void          initImageBins       PROTO((Catalog *catalog, int Ncatalog, int FULLINIT));
 void          initImages          PROTO((Image *input, off_t *line_number, off_t N));
-void          freeImages          PROTO(());
+void          freeImages          PROTO((char *dbImagePtr));
 void          initMosaicBins      PROTO((Catalog *catalog, int Ncatalog));
 void          initMosaicGrid      PROTO((Image *image, off_t Nimage));

trunk/Ohana/src/relastro/src/ImageOps.c

@@ -121 +121 @@
 }
 
-void freeImages () {
+void freeImages (char *dbImagePtr) {
 
   FREE (LineNumber);
@@ -134 +134 @@
 # endif
 
-  free (image);
+  // 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();
 }

trunk/Ohana/src/relastro/src/RepairWarpMeasures.c

@@ -9 +9 @@
   myAssert (!catalog->Nmeasure || catalog->measure, "programming error");
 
-  int NfixChipID = 0, NfixStackID = 0, NfixWarpID = 0, NfixWarpImageID = 0, NmissWarp = 0, NmissStack = 0, NbadWarp = 0;
+  int NfixChipID = 0, NfixStackID = 0, NfixWarpID = 0, NfixWarpImageID = 0, NmissWarp = 0, NmissStack = 0, NbadWarp = 0, NwarpNoImage = 0;
 
   int onePercent = catalog->Nmeasure / 100;
@@ -63 +63 @@
     double Rwrp = measure->R;
     double Dwrp = measure->D;
+
+    if (USE_IMAGE_COORDS_FOR_REPAIR) {
+      off_t idx = getImageByID (measure->imageID);
+      if (idx == -1) {
+        if (VERBOSE2) fprintf (stderr, "can't match detection to image?\n");
+        NwarpNoImage ++;
+        continue;
+      }
+
+      Coords *imcoords = &image[idx].coords;
+
+      XY_to_RD (&Rwrp, &Dwrp, X, Y, imcoords);
+      
+      Rwrp = ohana_normalize_angle_to_midpoint(Rwrp, 180.0);
+      Dwrp = ohana_normalize_angle_to_midpoint(Dwrp,   0.0);
+    }
 
     double Rave = average->R;
@@ -127 +143 @@
 
   fprintf (stderr, "\n");
-  fprintf (stderr, "repaired %s : warp image ID %d : ext ID chip %d stack %d warp %d : missed warp %d stack %d : bad warp: %d\n", catalog->filename, NfixWarpImageID, NfixChipID, NfixStackID, NfixWarpID, NmissWarp, NmissStack, NbadWarp);
+  fprintf (stderr, "repaired %s : warp image ID %d : ext ID chip %d stack %d warp %d : missed warp %d stack %d : bad warp: %d : warp no image: %d\n", catalog->filename, NfixWarpImageID, NfixChipID, NfixStackID, NfixWarpID, NmissWarp, NmissStack, NbadWarp, NwarpNoImage);
 
   return (TRUE);

trunk/Ohana/src/relastro/src/RepairWarps.c

@@ -109 +109 @@
                UserPatch.Rmin, UserPatch.Rmax, UserPatch.Dmin, UserPatch.Dmax);
 
-    if (VERBOSE)         strextend (&command, "-v");
-    if (VERBOSE2)        strextend (&command, "-vv");
-    if (UPDATE)          strextend (&command, "-update");
-    if (USE_BASIC_CHECK) strextend (&command, "-basic-image-search");
+    if (VERBOSE)                     strextend (&command, "-v");
+    if (VERBOSE2)                    strextend (&command, "-vv");
+    if (UPDATE)                      strextend (&command, "-update");
+    if (USE_BASIC_CHECK)             strextend (&command, "-basic-image-search");
+    if (USE_IMAGE_COORDS_FOR_REPAIR) strextend (&command, "-use-image-coords-for-repair");
+    if (USE_ALL_IMAGES)              strextend (&command, "-use-all-images");
 
     fprintf (stderr, "command: %s\n", command);

trunk/Ohana/src/relastro/src/args.c

@@ -312 +312 @@
       exit (2);
     }
+  }
+
+  // when repairing warp detections, check the model coordinates for consistency
+  USE_IMAGE_COORDS_FOR_REPAIR = FALSE;
+  if ((N = get_argument (argc, argv, "-use-image-coords-for-repair"))) {
+    remove_argument (N, &argc, argv);
+    USE_IMAGE_COORDS_FOR_REPAIR = TRUE;
   }
 
@@ -817 +824 @@
       exit (2);
     }
+  }
+
+  // when repairing warp detections, check the model coordinates for consistency
+  USE_IMAGE_COORDS_FOR_REPAIR = FALSE;
+  if ((N = get_argument (argc, argv, "-use-image-coords-for-repair"))) {
+    remove_argument (N, &argc, argv);
+    USE_IMAGE_COORDS_FOR_REPAIR = TRUE;
   }
 

trunk/Ohana/src/relastro/src/relastro.c

@@ -50 +50 @@
 
       if (!PARALLEL) {
+        freeImages (db.ftable.buffer);
         gfits_db_free (&db);
-        freeImages();
         freeMosaics ();
       } 
@@ -91 +91 @@
 
       if (!PARALLEL) {
+        freeImages (db.ftable.buffer);
         gfits_db_free (&db);
-        freeImages();
         freeMosaics ();
       } 

trunk/Ohana/src/relastro/src/relastro_client.c

@@ -92 +92 @@
       UpdateObjectOffsets (skylist, HOST_ID, HOSTDIR);
       
+      freeImages (db.ftable.buffer);
       gfits_db_free (&db);
-      freeImages();
       freeMosaics ();
 
@@ -119 +119 @@
       RepairWarps (skylist, HOST_ID, HOSTDIR);
       
+      freeImages (db.ftable.buffer);
       gfits_db_free (&db);
-      freeImages();
       freeMosaics ();
 

trunk/Ohana/src/relastro/src/relastro_images.c

@@ -137 +137 @@
     }
     dvo_image_unlock (&db); 
+    freeImages (db.ftable.buffer);
     gfits_db_free (&db);
-    freeImages();
   }
 
@@ -166 +166 @@
     }
     dvo_image_unlock (&db); 
+    freeImages(db.ftable.buffer);
     gfits_db_free (&db);
-    freeImages();
   }
 

trunk/Ohana/src/relastro/src/relastro_parallel_images.c

@@ -197 +197 @@
   freeStarMaps();
 
-  freeImages();
+  freeImages((char *) image);
   free (image);
 

trunk/Ohana/src/relastro/src/relastro_parallel_regions.c

@@ -87 +87 @@
   MARKTIME ("finished relastro -parallel-regions: %f sec total\n", dtime);
   
+  freeImages(db.ftable.buffer);
   gfits_db_free (&db);
-  freeImages();
   freeMosaics ();