Changeset 35805

Timestamp:

Jul 12, 2013, 1:17:12 PM (13 years ago)

Author:

eugene

Message:

allow a cpt with deletions completely removed to succeed

Location:

trunk/Ohana/src/delstar/src

Files:

• delete_fix_LAP_edges.c (modified) (1 diff)
• delete_fix_LAP_edges_delete.c (modified) (2 diffs)

trunk/Ohana/src/delstar/src/delete_fix_LAP_edges.c

@@ -237 +237 @@
       measure_edge[Nmeasure_edge].detID   = catalog[0].measure[m+j].detID;
       measure_edge[Nmeasure_edge].imageID = catalog[0].measure[m+j].imageID;
-    }
-    Nmeasure_edge ++;
-    CHECK_REALLOCATE (measure_edge, MeasureEdge, NMEASURE_EDGE, Nmeasure_edge, 1000);
+      Nmeasure_edge ++;
+      CHECK_REALLOCATE (measure_edge, MeasureEdge, NMEASURE_EDGE, Nmeasure_edge, 1000);
+    }
   }
 

trunk/Ohana/src/delstar/src/delete_fix_LAP_edges_delete.c

@@ -115 +115 @@
     if (UPDATE && !noChange) {
       // XXX save a backup copy first
-      dvo_catalog_backup (&catalog, TRUE);
+      // dvo_catalog_backup (&catalog, TRUE);
       dvo_catalog_save_complete (&catalog, VERBOSE2);
     }
@@ -298 +298 @@
   }
 
-  if (Ndrop != NbadMeasures) {
-    fprintf (stderr, "ERROR: wrong number of bad detections!\n");
-    invalid = TRUE;
+  if (Ndrop == 0) {
+    fprintf (stderr, "duplicates already deleted for %s\n", catalog[0].filename);
+    free (measureDrop);
+    free (badMeasures);
+    return FALSE;
+  } else { 
+    if (Ndrop != NbadMeasures) {
+      fprintf (stderr, "ERROR: wrong number of bad detections!\n");
+      invalid = TRUE;
+    }
   }