Changeset 37040

Timestamp:

Jul 17, 2014, 10:15:20 AM (12 years ago)

Author:

eugene

Message:

updates from eam_branches/ipp-21040610

Location:

trunk/Ohana/src/delstar

Files:

• include/delstar.h (modified) (1 diff)
• src/ImageOpsFixLAP.c (modified) (1 diff)
• src/ImageSubsetFixLAP.c (modified) (1 diff)
• src/MeasureEdgeOps.c (modified) (1 diff)
• src/delete_fix_LAP_edges.c (modified) (2 diffs)

trunk/Ohana/src/delstar/include/delstar.h

@@ -2 +2 @@
 # 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)

trunk/Ohana/src/delstar/src/ImageOpsFixLAP.c

@@ -1 +1 @@
 # include "delstar.h"
-# define FT_BZERO_INT32 1.0*0x80000000
 
 off_t   Nimage = 0;

trunk/Ohana/src/delstar/src/ImageSubsetFixLAP.c

@@ -1 +1 @@
 # include "delstar.h"
-# define FT_BZERO_INT16 1.0*0x8000        
-# define FT_BZERO_INT32 1.0*0x80000000
 
 # define GET_COLUMN(OUT,NAME,TYPE) \

trunk/Ohana/src/delstar/src/MeasureEdgeOps.c

@@ -1 +1 @@
 # include "delstar.h"
-# define FT_BZERO_INT32 1.0*0x80000000
 
 # define GET_COLUMN(OUT,NAME,TYPE) \

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

@@ -206 +206 @@
   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 +220 @@
     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);