Index: /trunk/Ohana/src/delstar/include/delstar.h
===================================================================
--- /trunk/Ohana/src/delstar/include/delstar.h	(revision 37039)
+++ /trunk/Ohana/src/delstar/include/delstar.h	(revision 37040)
@@ -2,13 +2,4 @@
 # include <dvo.h>
 # include <signal.h>
-
-# define MARKTIME(MSG,...) {			\
-    gettimeofday (&stopTimer, (void *) NULL);	\
-    float dtime = DTIME (stopTimer, startTimer);	\
-    fprintf (stderr, MSG, __VA_ARGS__); }
-
-# define INITTIME \
-  struct timeval startTimer, stopTimer; \
-  gettimeofday (&startTimer, (void *) NULL);
 
 // options for generating the IndexArray used to select images for deletion (delete_duplicate_images.c)
Index: /trunk/Ohana/src/delstar/src/ImageOpsFixLAP.c
===================================================================
--- /trunk/Ohana/src/delstar/src/ImageOpsFixLAP.c	(revision 37039)
+++ /trunk/Ohana/src/delstar/src/ImageOpsFixLAP.c	(revision 37040)
@@ -1,4 +1,3 @@
 # include "delstar.h"
-# define FT_BZERO_INT32 1.0*0x80000000
 
 off_t   Nimage = 0;
Index: /trunk/Ohana/src/delstar/src/ImageSubsetFixLAP.c
===================================================================
--- /trunk/Ohana/src/delstar/src/ImageSubsetFixLAP.c	(revision 37039)
+++ /trunk/Ohana/src/delstar/src/ImageSubsetFixLAP.c	(revision 37040)
@@ -1,5 +1,3 @@
 # include "delstar.h"
-# define FT_BZERO_INT16 1.0*0x8000	  
-# define FT_BZERO_INT32 1.0*0x80000000
 
 # define GET_COLUMN(OUT,NAME,TYPE) \
Index: /trunk/Ohana/src/delstar/src/MeasureEdgeOps.c
===================================================================
--- /trunk/Ohana/src/delstar/src/MeasureEdgeOps.c	(revision 37039)
+++ /trunk/Ohana/src/delstar/src/MeasureEdgeOps.c	(revision 37040)
@@ -1,4 +1,3 @@
 # include "delstar.h"
-# define FT_BZERO_INT32 1.0*0x80000000
 
 # define GET_COLUMN(OUT,NAME,TYPE) \
Index: /trunk/Ohana/src/delstar/src/delete_fix_LAP_edges.c
===================================================================
--- /trunk/Ohana/src/delstar/src/delete_fix_LAP_edges.c	(revision 37039)
+++ /trunk/Ohana/src/delstar/src/delete_fix_LAP_edges.c	(revision 37040)
@@ -206,4 +206,6 @@
   double Dgapmin = Dmin + dD;
   double Dgapmax = Dmax - dD;
+  
+  float cosDec = cos(RAD_DEG * 0.5 * (Dmin + Dmax));
 
   // XXX should deal with pole, but not yet...
@@ -218,7 +220,9 @@
     float maxOff = 0.0;
     m = catalog[0].average[i].measureOffset;
+
     for (j = 0; j < catalog[0].average[i].Nmeasure; j++) {
-      float dRoff = catalog[0].measure[m+j].dR * cos(RAD_DEG * 0.5 * (Dmin + Dmax));
-      float dDoff = catalog[0].measure[m+j].dD;
+
+      float dRoff = dvoOffsetR(&catalog[0].measure[m+j], &catalog[0].average[i])*cosDec;
+      float dDoff = dvoOffsetD(&catalog[0].measure[m+j], &catalog[0].average[i]);
       float dOff = hypot (dRoff, dDoff);
       maxOff = MAX (maxOff, dOff);