Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/addstar/src/ReadImageHeader.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/src/ReadImageHeader.c (modified) (9 diffs)

branches/simtest_nebulous_branches/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, sourceID;
+  int Nastro, hour, min, Nx, Ny, haveNx, haveNy, sourceID;
   double tmp, sec, Cerror, ZeroPt, FWHM_X, FWHM_Y;
-  char *c, photname[64], line[80];
+  char *c, photname[64], line[80], ccdnum[64];
   PhotCode *photcodeData = NULL;
 
@@ -85 +85 @@
   }
 
-  { 
+  {
     double R, D;
     /* sanity check on the image coordinates */
@@ -94 +94 @@
     }
   }
-    
+
   /* CERROR in data file is in arcsec */
   if (!gfits_scan (header, "CERROR",   "%lf", 1, &tmp)) tmp = 1.0;
   image[0].cerror = tmp * 50.0;
- 
+
   /* get photcode from header */
   if (photcode == 0) {
@@ -112 +112 @@
     photcode = photcodeData[0].code;
   }
-  if (photcode == 0) { 
+  if (photcode == 0) {
     fprintf (stderr, "no valid photcode is supplied\n");
     return (FALSE);
@@ -122 +122 @@
   gfits_scan (header, ExptimeKeyword,  "%lf", 1, &tmp);
   image[0].exptime = tmp;
-  
+
   /*** why are we no longer using APMIFIT?? ***/
   tmp = 0;
@@ -172 +172 @@
   if (gfits_scan (header, AirmassKeyword, "%lf", 1, &tmp)) {
     image[0].secz = tmp;
-  } 
-
-  if (!gfits_scan (header, CCDNumKeyword, "%d", 1, &ccdnum)) {
-    image[0].ccdnum = 0xff;
-  } else {
-    image[0].ccdnum = ccdnum;
+  }
+
+  if (!gfits_scan (header, CCDNumKeyword, "%s", 1, ccdnum)) {
+    fprintf (stderr, "CCDNumKeyword %s not found\n", CCDNumKeyword);
+    return FALSE;
+  } else {
+    // CCDNumKeyword (EXTNAME) is a string yet we need an integer
+    // RULE: ccdnum is the value of the first string of digits in CCDNumKeyword
+    // For example: ccdnum(XY42.hdr) = 42, ccdnum(XY01.hdr) = 1
+    // if no digits occur, then we assume there is only one ccd
+    char *p = ccdnum;
+    // get rid of any leading non-digit characters
+    while (*p && !isdigit(*p)) p++;
+    if (*p) {
+      image[0].ccdnum = atoi(p);
+    } else {
+      image[0].ccdnum = 0;
+    }
   }
 
@@ -187 +199 @@
   } else {
     if (sourceID > 0xffff) {
-      fprintf (stderr, "image source ID is surprisingly large: %d, skipping\n", sourceID); 
+      fprintf (stderr, "image source ID is surprisingly large: %d, skipping\n", sourceID);
       return (FALSE);
     }
@@ -196 +208 @@
   // 0 - 32 so it would fit in an unsigned int.  This is also needed because some programs like
   // sextractor will put in an arbitrary zero point that we need to understand to get back to
-  // instrumental mags.  
+  // instrumental mags.
   gfits_scan (header, "ZERO_PT", "%lf", 1, &ZeroPt);
   if (ZeroPt != GetZeroPoint()) {
-      fprintf (stderr, "inconsistent zero point values: image: %f, config: %f\n", ZeroPt, GetZeroPoint()); 
-      return (FALSE);
-  }
-
-  // if it exists, find the 
+      fprintf (stderr, "WARNING: inconsistent zero point values: image: %f, config: %f\n", ZeroPt, GetZeroPoint());
+  }
+
+  // in this case, lookup and apply the zero point measured for this chip
   if (!strcasecmp(ZERO_POINT_OPTION, "CHIP_HEADER")) {
       float ZPT_OBS;
       if (!photcodeData || !gfits_scan (header, "ZPT_OBS", "%f", 1, &ZPT_OBS)) {
-          fprintf (stderr, "zero point not supplied in header\n");
-          ZERO_POINT_OFFSET = 0.0;
+          fprintf (stderr, "zero point not supplied in header\n");
+          ZERO_POINT_OFFSET = 0.0;
       } else {
-          ZERO_POINT_OFFSET = 0.001*photcodeData[0].C - ZPT_OBS;
-      }   
+          ZERO_POINT_OFFSET = 0.001*photcodeData[0].C - ZPT_OBS;
+      }
+  }
+
+  // in this case, lookup and apply the zero point measured for the exposure
+  if (!strcasecmp(ZERO_POINT_OPTION, "PHU_HEADER")) {
+      if (!photcodeData) {
+          fprintf (stderr, "photcode data not supplied for this chip\n");
+          ZERO_POINT_OFFSET = 0.0;
+      } else {
+          ZERO_POINT_OFFSET = 0.001*photcodeData[0].C - ZERO_POINT_OFFSET;
+      }
   }
 
@@ -221 +242 @@
   /* find expected number of stars */
   if (!gfits_scan (header, "NSTARS", "%d", 1, &image[0].nstar) && !NO_STARS) {
-    fprintf (stderr, "can't get NSTARS from header\n");
-    return (FALSE);
+    fprintf (stderr, "WARNING: can't get NSTARS from header (TEXT mode will be invalid)\n");
   }