Changeset 35871 for branches/eam_branches/ipp-20130711/Ohana

Timestamp:

Aug 2, 2013, 10:43:43 AM (13 years ago)

Author:

eugene

Message:

changes needed for optimized build

Location:

branches/eam_branches/ipp-20130711/Ohana/src/delstar

Files:

• include/delstar.h (modified) (1 diff)
• src/delete_fix_LAP.c (modified) (2 diffs)
• src/delete_fix_LAP_edges.c (modified) (1 diff)
• src/delete_fix_LAP_edges_delete.c (modified) (2 diffs)
• src/delstar.c (modified) (1 diff)

branches/eam_branches/ipp-20130711/Ohana/src/delstar/include/delstar.h

@@ -138 +138 @@
 void SortAveMeasMatch (off_t *MEAS, off_t *AVE, off_t N);
 
-int delete_photcodes ();
+int delete_photcodes (void);
 int delete_photcodes_parallel (SkyList *sky);
 int delete_photcodes_catalog (Catalog *catalog, PhotCode **photcodes, int Nphotcodes);

branches/eam_branches/ipp-20130711/Ohana/src/delstar/src/delete_fix_LAP.c

@@ -587 +587 @@
     // for gpc1 exposures, 10000 < photcode < 10600
     if ((11000 <= measure[j].photcode) && (measure[j].photcode < 11600)) {
+      int sourceID = -1;
+      int externID = -1;
+      int detID = -1;
+
       int resetID = FALSE;
       off_t imageID = measure[j].imageID;
@@ -604 +608 @@
       }
 
-      int sourceID = -1;
-      int externID = -1;
-      int detID = -1;
       UnpackPSPSStackDetectionID (&sourceID, &externID, &detID, measure[j].extID);
       if (externID != image[imageN].externID) {

branches/eam_branches/ipp-20130711/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);
+    }
   }
 

branches/eam_branches/ipp-20130711/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;
+    }
   }
 

branches/eam_branches/ipp-20130711/Ohana/src/delstar/src/delstar.c

@@ -99 +99 @@
       }
 
-      if (!delete_photcodes (0, NULL)) {
+      if (!delete_photcodes ()) {
         fprintf (stderr, "failure deleting measurements\n");
         exit (1);