Changeset 26338

Timestamp:

Dec 4, 2009, 3:55:27 PM (16 years ago)

Author:

bills

Message:

set parentID and externID

Location:

trunk/Ohana/src/addstar/src

Files:

• FilterStars.c (modified) (1 diff)
• LoadData.c (modified) (2 diffs)
• UpdateImageIDs.c (modified) (1 diff)

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -1 +1 @@
 # include "addstar.h"
-# define EXTERNAL_ID FALSE
+# define EXTERNAL_ID TRUE
 
 /* exclude some detections based on various filter options:

trunk/Ohana/src/addstar/src/LoadData.c

@@ -10 +10 @@
   char *name;
   int i, j, Nvalid, Nhead, Ndata, Nskip;
+  unsigned int parentID = UINT_MAX;
   Stars *inStars;
 
@@ -58 +59 @@
     // skip the table if there is no data segment (eg, mosaic WRP image)
     if (!strcmp(headerSets[i].extdata, "NONE")) {
+      if (!strcmp(headerSets[i].exthead, "PHU") && (Nimages > 1)) {
+        // This image is the parent of subsequent images
+        parentID = Nvalid;
+        images[0][Nvalid].parentID = UINT_MAX;
+      }
       Nvalid++;
       CHECK_REALLOCATE (images[0], Image, NVALID, Nvalid, 10);
       continue;
     }
+    images[0][Nvalid].parentID = parentID;
 
     // advance the pointer to the start of the corresponding table block

trunk/Ohana/src/addstar/src/UpdateImageIDs.c

@@ -40 +40 @@
   for (i = 0; i < Nimages; i++) {
     images[i].imageID += imageID;
+    if (images[i].parentID == UINT_MAX) {
+        images[i].parentID = 0;
+    } else {
+        images[i].parentID += imageID;
+    }
   }