Changeset 35743 for branches/eam_branches/ipp-20130509/Ohana

Timestamp:

Jul 3, 2013, 12:23:57 PM (13 years ago)

Author:

eugene

Message:

final fixes to fix-LAP-edges-delete; whitespace changes

Location:

branches/eam_branches/ipp-20130509/Ohana/src

Files:

• addstar/src/resort_catalog.c (modified) (3 diffs)
• delstar/src/Shutdown.c (modified) (1 diff)
• delstar/src/delete_fix_LAP_edges_delete.c (modified) (5 diffs)
• delstar/src/delstar_client.c (modified) (1 diff)
• libdvo/include/dvo.h (modified) (1 diff)

branches/eam_branches/ipp-20130509/Ohana/src/addstar/src/resort_catalog.c

@@ -32 +32 @@
 void SortAveMeasMatch (off_t *MEAS, off_t *AVE, off_t N) {
 
-# define SWAPFUNC(A,B){ off_t tmp_meas; off_t tmp_ave;  \
-    tmp_meas = MEAS[A]; MEAS[A] = MEAS[B]; MEAS[B] = tmp_meas;          \
-    tmp_ave  = AVE[A];  AVE[A]  = AVE[B];  AVE[B]  = tmp_ave;           \
+# define SWAPFUNC(A,B){ off_t tmp_meas; off_t tmp_ave;          \
+    tmp_meas = MEAS[A]; MEAS[A] = MEAS[B]; MEAS[B] = tmp_meas;  \
+    tmp_ave  = AVE[A];  AVE[A]  = AVE[B];  AVE[B]  = tmp_ave;   \
   }
 # define COMPARE(A,B)(AVE[A] < AVE[B])
@@ -42 +42 @@
 }
 
-# define MARKTIME(MSG,...) { \
-  float dtime; \
-  gettimeofday (&stop, (void *) NULL); \
-  dtime = DTIME (stop, start); start = stop; \
-  fprintf (stderr, MSG, __VA_ARGS__); }
+# define MARKTIME(MSG,...) {                    \
+    float dtime;                                \
+    gettimeofday (&stop, (void *) NULL);        \
+    dtime = DTIME (stop, start); start = stop;  \
+    fprintf (stderr, MSG, __VA_ARGS__); }
 
 // XXX : where is the time going?  perhaps the ALLOCATE?
@@ -101 +101 @@
         measure[measureSeq[i]].objID = average[averageSeq[i]].objID; // XXX I don't really like this...
       }
+# endif
     }
-# endif
   }
   

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/Shutdown.c

@@ -22 +22 @@
 
   SetProtect (TRUE);
-  gfits_db_close (db);
+  if (db) gfits_db_close (db);
   fprintf (stderr, "ERROR: delstar halted\n");
   exit (1);

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delete_fix_LAP_edges_delete.c

@@ -83 +83 @@
 
     int myCatID = skylist[0].regions[i][0].index;
+    if (myCatID > maxCatID) continue;
     if (!catIDcount[myCatID]) continue;
 
@@ -106 +107 @@
     }
 
+    off_t NaverageStart = catalog.Naverage;
+    off_t NmeasureStart = catalog.Nmeasure;
     delete_fix_LAP_edges_drop_measures (&catalog, measure_edge, Nmeasure_edge, catIDcount[myCatID]);
 
-    // need to save the catalog here, after we confirm functionality
+    // skip if nothing was deleted
+    int noChange = (NaverageStart == catalog.Naverage) && (NmeasureStart == catalog.Nmeasure);
+    if (UPDATE && !noChange) {
+      // XXX save a backup copy first
+      dvo_catalog_backup (&catalog, TRUE);
+      dvo_catalog_save_complete (&catalog, VERBOSE2);
+    }
 
     dvo_catalog_unlock (&catalog);
@@ -135 +144 @@
     exit (1);
   }    
+
+  { 
+    // ensure that the paths are absolute path names
+    char *tmppath = abspath (EDGE_DELETIONS, DVO_MAX_PATH);
+    free (EDGE_DELETIONS);
+    EDGE_DELETIONS = tmppath;
+  }
 
   int i, j;
@@ -172 +188 @@
     if (VERBOSE2)   { snprintf (tmpline, 1024, "%s -vv",     command);             strcpy (command, tmpline); }
     if (SINGLE_CPT) { snprintf (tmpline, 1024, "%s -cpt %s", command, SINGLE_CPT); strcpy (command, tmpline); }
-    // if (UPDATE)     { snprintf (tmpline, 1024, "%s -update", command);             strcpy (command, tmpline); }
+    if (UPDATE)     { snprintf (tmpline, 1024, "%s -update", command);             strcpy (command, tmpline); }
 
     fprintf (stderr, "command: %s\n", command);
@@ -224 +240 @@
   for (i = 0; i < Nmeasure_edge; i++) {
     if (measure_edge[i].catID != myCatID) continue;
-    myAssert (NbadMeasures >= catIDcount, "too many bad measures?");
+    myAssert (NbadMeasures < catIDcount, "too many bad measures?");
     badMeasures[NbadMeasures] = i;
     NbadMeasures ++;

branches/eam_branches/ipp-20130509/Ohana/src/delstar/src/delstar_client.c

@@ -58 +58 @@
     }
 
+    case MODE_FIX_LAP_EDGES_DELETE: {
+      if (!delete_fix_LAP_edges_delete()) {
+        fprintf (stderr, "problem loading edge measures\n"); 
+        exit (1);
+      }
+      exit (0);
+      break;
+    }
+
     case MODE_IMAGEFILE:
       break;

branches/eam_branches/ipp-20130509/Ohana/src/libdvo/include/dvo.h

@@ -251 +251 @@
 /* definitions for parallel dvo host information 
    XXX : need better names (safer namespace)
- */
+*/
 
 typedef enum {