Changeset 20936 for trunk/Ohana/src/addstar

Timestamp:

Dec 7, 2008, 3:31:01 PM (18 years ago)

Author:

eugene

Message:

big update from eam_branch_20081124 with updates to Opihi math

Location:

trunk/Ohana/src/addstar

Files:

• Makefile (modified) (3 diffs)
• include/addstar.h (modified) (1 diff)
• include/mkcmf.h (added)
• 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)
• src/mkcmf.c (added)
• test (added)
• test/.cvsignore (added)
• test/addstar.sh (added)

trunk/Ohana/src/addstar/Makefile

@@ -25 +25 @@
 load2mass   : $(BIN)/load2mass.$(ARCH)
 gztest      : $(BIN)/gztest.$(ARCH)
+mkcmf       : $(BIN)/mkcmf.$(ARCH)
 
 all: addstar addstarc addstard addstart sedstar load2mass skycells
@@ -222 +223 @@
 $(SRC)/SetSignals.$(ARCH).o
 
+MKCMF = \
+$(SRC)/mkcmf.$(ARCH).o
+
 SKYCELLS = \
 $(SRC)/skycells.$(ARCH).o \
@@ -230 +234 @@
 $(SRC)/sky_tessalation.$(ARCH).o
 
-$(ADDSTARC) : $(INC)/addstar.h
-$(ADDSTARD) : $(INC)/addstar.h
-$(ADDSTART) : $(INC)/addstar.h
-$(ADDSTAR)  : $(INC)/addstar.h
-$(SKYCELLS) : $(INC)/addstar.h
+$(ADDSTARC)   : $(INC)/addstar.h
+$(ADDSTARD)   : $(INC)/addstar.h
+$(ADDSTART)   : $(INC)/addstar.h
+$(ADDSTAR)    : $(INC)/addstar.h
+$(SKYCELLS)   : $(INC)/addstar.h
 $(LOAD-2MASS) : $(INC)/addstar.h $(INC)/2mass.h
-
-$(BIN)/addstar.$(ARCH) : $(ADDSTAR)
-$(BIN)/addstard.$(ARCH) : $(ADDSTARD)
-$(BIN)/addstart.$(ARCH) : $(ADDSTART)
-$(BIN)/addstarc.$(ARCH) : $(ADDSTARC)
+$(MKCMF)      : $(INC)/mkcmf.h
+
+$(BIN)/addstar.$(ARCH)     : $(ADDSTAR)
+$(BIN)/addstard.$(ARCH)    : $(ADDSTARD)
+$(BIN)/addstart.$(ARCH)    : $(ADDSTART)
+$(BIN)/addstarc.$(ARCH)    : $(ADDSTARC)
 $(BIN)/mkacc-2mass.$(ARCH) : $(MKACC-2MASS)
-$(BIN)/sedstar.$(ARCH)   : $(SEDSTAR)
-$(BIN)/load2mass.$(ARCH) : $(LOAD-2MASS)
-$(BIN)/skycells.$(ARCH) : $(SKYCELLS)
-
-INSTALL = addstar addstarc addstard addstart sedstar load2mass skycells
+$(BIN)/sedstar.$(ARCH)     : $(SEDSTAR)
+$(BIN)/load2mass.$(ARCH)   : $(LOAD-2MASS)
+$(BIN)/skycells.$(ARCH)    : $(SKYCELLS)
+$(BIN)/mkcmf.$(ARCH)       : $(MKCMF)
+
+INSTALL = addstar addstarc addstard addstart sedstar load2mass skycells mkcmf
 
 # dependancy rules for binary code #########################

trunk/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) */

trunk/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)) {

trunk/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()) {

trunk/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;

trunk/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;