Changeset 36833 for trunk/Ohana/src/dvomerge

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

Location:

trunk/Ohana/src/dvomerge/src

Files:

• dvo_image_merge_dbs.c (modified) (1 diff)
• dvomergeImageIDs.c (modified) (2 diffs)
• dvorepairCPT.c (modified) (1 diff)
• dvorepairDeleteImageList.c (modified) (1 diff)
• dvorepairFixTables.c (modified) (1 diff)

trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -168 +168 @@
 
   if (!IDmap->old) {
+    fprintf (stderr, "input database has image IDs, but no Image table\n");
+    return FALSE;
+  }
+
+  if (!IDmap->Nmap) {
     fprintf (stderr, "input database has image IDs, but no Image table\n");
     return FALSE;

trunk/Ohana/src/dvomerge/src/dvomergeImageIDs.c

@@ -18 +18 @@
   if (inDB.dbstate == LCK_EMPTY) {
     dvo_image_unlock (&inDB); // unlock input
+    IDmap->old = NULL;
+    IDmap->new = NULL;
     IDmap->Nmap = 0;
     return TRUE;
@@ -99 +101 @@
   if (inDB.dbstate == LCK_EMPTY) {
     dvo_image_unlock (&inDB); // unlock input
+    IDmap->old = NULL;
+    IDmap->new = NULL;
     IDmap->Nmap = 0;
     return TRUE;

trunk/Ohana/src/dvomerge/src/dvorepairCPT.c

@@ -126 +126 @@
     average[Nave].measureOffset = -1;
     average[Nave].missingOffset = -1;
-    average[Nave].extendOffset = -1;
+    average[Nave].refColor = NAN;
 
     average[Nave].objID = measure[i].objID;

trunk/Ohana/src/dvomerge/src/dvorepairDeleteImageList.c

@@ -411 +411 @@
     average[Nave].measureOffset = -1;
     average[Nave].missingOffset = -1;
-    average[Nave].extendOffset = -1;
+    average[Nave].refColor = NAN;
 
     average[Nave].objID = measure[i].objID;

trunk/Ohana/src/dvomerge/src/dvorepairFixTables.c

@@ -266 +266 @@
     average[Nave].measureOffset = -1;
     average[Nave].missingOffset = -1;
-    average[Nave].extendOffset = -1;
+    average[Nave].refColor = NAN;
 
     average[Nave].objID = measure[i].objID;