Changeset 20906

Timestamp:

Dec 4, 2008, 6:06:38 PM (17 years ago)

Author:

eugene

Message:

supply external IDs, fixing measure->imageID

Location:

branches/eam_branch_20081124/Ohana/src/addstar

Files:

• include/addstar.h (modified) (1 diff)
• src/ConfigInit.c (modified) (1 diff)
• src/ReadImageHeader.c (modified) (2 diffs)
• src/find_matches.c (modified) (1 diff)
• src/find_matches_closest.c (modified) (2 diffs)

branches/eam_branch_20081124/Ohana/src/addstar/include/addstar.h

@@ -87 +87 @@
 char   STKeyword[64];
 char   ExtnameKeyword[64];
+char   ImageIDKeyword[64];
+char   SourceIDKeyword[64];
 
 /* these globals modify the behavior of gstars (KEEP) */

branches/eam_branch_20081124/Ohana/src/addstar/src/ConfigInit.c

@@ -67 +67 @@
   ScanConfig (config, "OBSERVATORY-LONGITUDE",  "%lf", 0, &Longitude);
   ScanConfig (config, "SUBPIX_DATAFILE",        "%s",  0, SubpixDatafile);
+
+  ScanConfig (config, "IMAGE-ID-KEYWORD",       "%s",  0, ImageIDKeyword);
+  ScanConfig (config, "SOURCE-ID-KEYWORD",      "%s",  0, SourceIDKeyword);
 
   if (!ScanConfig (config, "EXTNAME-KEYWORD",        "%s",  0, ExtnameKeyword)) {

branches/eam_branch_20081124/Ohana/src/addstar/src/ReadImageHeader.c

@@ -5 +5 @@
 int ReadImageHeader (Header *header, Image *image, int photcode) {
 
-  int Nastro, ccdnum, hour, min, Nx, Ny, haveNx, haveNy;
+  int Nastro, ccdnum, hour, min, Nx, Ny, haveNx, haveNy, sourceID;
   double tmp, sec, Cerror, ZeroPt, FWHM_X, FWHM_Y;
   char *c, photname[64], line[80];
@@ -178 +178 @@
   }
 
+  if (!gfits_scan (header, ImageIDKeyword, "%d", 1, &image[0].externID)) {
+    image[0].externID = 0;
+  }
+  if (!gfits_scan (header, SourceIDKeyword, "%d", 1, &sourceID)) {
+    image[0].sourceID = 0;
+  } else {
+    if (sourceID > 0xffff) {
+      fprintf (stderr, "image source ID is surprisingly large: %d, skipping\n", sourceID); 
+      return (FALSE);
+    }
+    image[0].sourceID = sourceID;
+  }
+
   gfits_scan (header, "ZERO_PT", "%lf", 1, &ZeroPt);
   if (ZeroPt != GetZeroPoint()) {

branches/eam_branch_20081124/Ohana/src/addstar/src/find_matches.c

@@ -193 +193 @@
 
       catalog[0].measure[Nmeas].detID     = stars[N].detID;
-      catalog[0].measure[Nmeas].imageID   = options.imageID;
+      catalog[0].measure[Nmeas].imageID   = stars[N].imageID;
 
       catalog[0].measure[Nmeas].dXccd     = stars[N].dX;

branches/eam_branch_20081124/Ohana/src/addstar/src/find_matches_closest.c

@@ -215 +215 @@
 
     catalog[0].measure[Nmeas].detID     = stars[N].detID;
-    catalog[0].measure[Nmeas].imageID   = options.imageID;
+    catalog[0].measure[Nmeas].imageID   = stars[N].imageID;
 
     catalog[0].measure[Nmeas].dXccd     = stars[N].dX;
@@ -327 +327 @@
 
     catalog[0].measure[Nmeas].detID     = stars[N].detID;
-    catalog[0].measure[Nmeas].imageID   = options.imageID;
+    catalog[0].measure[Nmeas].imageID   = stars[N].imageID;
 
     catalog[0].measure[Nmeas].dXccd     = stars[N].dX;