Changeset 39041 for trunk/Ohana/src/addstar

Timestamp:

Nov 5, 2015, 1:04:07 PM (11 years ago)

Author:

eugene

Message:

add zero point keyword option for diffs; add flag for best object; set best object flag in relphot

Location:

trunk/Ohana/src/addstar

Files:

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

trunk/Ohana/src/addstar/include/addstar.h

@@ -131 +131 @@
 
 char    ZERO_POINT_OPTION[64];
+char    ZERO_POINT_KEYWORD[64];
 float   ZERO_POINT_OFFSET;
 float   ZERO_POINT_ERROR;

trunk/Ohana/src/addstar/src/ConfigInit.c

@@ -105 +105 @@
   if (!ScanConfig (config, "ZERO_POINT_OPTION", "%s",  0, ZERO_POINT_OPTION)) {
       strcpy (ZERO_POINT_OPTION, "NOMINAL"); 
+  }
+  // if this config variable is not set, do not set any zero point offset
+  if (!ScanConfig (config, "ZERO_POINT_KEYWORD", "%s",  0, ZERO_POINT_KEYWORD)) {
+      strcpy (ZERO_POINT_KEYWORD, "ZPT_OBS"); 
   }
 

trunk/Ohana/src/addstar/src/GetZeroPointExposure.c

@@ -53 +53 @@
             Nhead = headerSets[i].extnum_head;
 
-            if (!gfits_scan (headers[Nhead], "ZPT_OBS", "%f", 1, &ZPT_OBS)) {
+            if (!gfits_scan (headers[Nhead], ZERO_POINT_KEYWORD, "%f", 1, &ZPT_OBS)) {
                 fprintf (stderr, "zero point not supplied in header\n");
                 continue;
@@ -113 +113 @@
             
             float ZPT_OBS, ZPT_ERR;
-            if (!gfits_scan (headers[Nhead], "ZPT_OBS", "%f", 1, &ZPT_OBS)) {
+            if (!gfits_scan (headers[Nhead], ZERO_POINT_KEYWORD, "%f", 1, &ZPT_OBS)) {
                 fprintf (stderr, "WARNING: zero point is not measured, no valid entries in headers\n");
                 return (FALSE);

trunk/Ohana/src/addstar/src/ReadImageHeader.c

@@ -237 +237 @@
   if (!strcasecmp(ZERO_POINT_OPTION, "CHIP_HEADER")) {
       float ZPT_OBS;
-      if (!photcodeData || !gfits_scan (header, "ZPT_OBS", "%f", 1, &ZPT_OBS)) {
+      if (!photcodeData || !gfits_scan (header, ZERO_POINT_KEYWORD, "%f", 1, &ZPT_OBS)) {
           fprintf (stderr, "zero point not supplied in header\n");
           ZERO_POINT_OFFSET = 0.0;