Changeset 36833 for trunk/Ohana/src/delstar/include/delstar.h

Timestamp:

Jun 7, 2014, 6:33:11 AM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20140423: add dcr-color option, ref_color, bad detection clipping to relastro; fix RA,DEC for mosaics in imextract; allow photdbc to restrict images to output region; change PHOTCODE_SKIP_LIST to PHOTCODE_KEEP_LIST in photdbc; add -reset-to-photcode option to relastro; ensure relastro child processes get the complete set of options; allow relastro region hosts to continue after load-object clients are done, but before the data is loaded; invalidate extreme proper motion; limit relastro catalog density on a grid; require more detections for higher order fits; option to delete duplicate images based on exp time/date and photcode; have kapa use XSync instead of XFlush to avoid flashing; handle some cases to avoid crashing kapa; extend kapa connection timeout; allow kapa to handle > 2GB images; ensure dvomerge works even if incoming db has no images; add dvo fuctions coordmosaic & psastro_model

File:

• trunk/Ohana/src/delstar/include/delstar.h (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)
@@ -67 +76 @@
 int    UPDATE;
 int    IMAGE_DETAILS;
+int    IMAGE_DUPLICATES_BY_OBSTIME;
 int    IMAGE_ONLY;
 int    ORPHAN;