Changeset 14574

Timestamp:

Aug 20, 2007, 3:44:48 PM (19 years ago)

Author:

eugene

Message:

do not require photcode or nstars

File:

• trunk/Ohana/src/getstar/src/ReadImageHeader.c (modified) (4 diffs)

trunk/Ohana/src/getstar/src/ReadImageHeader.c

@@ -4 +4 @@
 int ReadImageHeader (Header *header, Image *image) {
 
-  int Nastro, ccdnum, hour, min, Nx, Ny, photcode;
+  int Nastro, ccdnum, hour, min, Nx, Ny;
   double tmp, sec, Cerror;
   char *c, photname[64], line[80];
@@ -66 +66 @@
   image[0].cerror = tmp * 50.0;
  
-  /* get photcode from header */
-  /*** XXX is photcode needed?? ***/
-  if (!gfits_scan (header, "PHOTCODE", "%s", 1, photname)) {
-    fprintf (stderr, "photcode not supplied in header\n");
-    return (FALSE);
-  }
-  photcode = GetPhotcodeCodebyName (photname);
-  if (photcode == 0) { 
-    fprintf (stderr, "no valid photcode is supplied\n");
-    return (FALSE);
-  }
-  image[0].photcode = photcode;
-
-  // XXX we don't really need these
-  // gfits_scan (header, ExptimeKeyword,  "%lf", 1, &tmp);
-  // image[0].exptime = tmp;
-  
   /*** why are we no longer using APMIFIT?? ***/
   tmp = 0;
@@ -108 +91 @@
   image[0].fwhm_y = tmp * 25.0 * image[0].coords.cdelt1 * 3600.0;
 
-  // XXX we don't really need the following values
-# if (0)  
-  if (STKeyword[0]) {
-    /* get ST (used for airmass calculation) */
-    gfits_scan (header, STKeyword, "%s", 1, line);
-    /* remove ':' characters */
-    for (c = strchr (line, ':'); c != (char *) NULL; c = strchr (line, ':')) { *c = ' '; }
-    sscanf (line, "%d %d %lf", &hour, &min, &sec);
-    image[0].sidtime = hour + min/60.0 + sec/3600.0;
-  } else {
-    double jd;
-    jd = sec_to_jd (image[0].tzero);
-    image[0].sidtime  = ohana_lst (jd, Longitude);
-  }
-  image[0].latitude = Latitude;
-
-  tmp = 0;
-  gfits_scan (header, "TRATE",   "%lf", 1, &tmp);
-  image[0].trate = 10000 * tmp;
-
-  tmp = 0;
-  gfits_scan (header, AirmassKeyword, "%lf", 1, &tmp);
-  image[0].secz = MIN (NO_MAG, tmp);
-
-  if (!gfits_scan (header, CCDNumKeyword, "%d", 1, &ccdnum)) {
-    image[0].ccdnum = 0xff;
-  } else {
-    image[0].ccdnum = ccdnum;
-  }
-
-  gfits_scan (header, "ZERO_PT", "%lf", 1, &ZeroPt);
-  SetZeroPoint (ZeroPt);
-# endif
+  image[0].trate = 0.0;
+  image[0].secz = NO_MAG;
+  image[0].ccdnum = 0;
 
   /* secz is in units milli-airmass */
@@ -148 +101 @@
   bzero (image[0].dummy, sizeof(image[0].dummy));
 
-  /* find expected number of stars */
-  if (!gfits_scan (header, "NSTARS", "%d", 1, &image[0].nstar)) {
-    fprintf (stderr, "can't get NSTARS from header\n");
-    return (FALSE);
-  }
-
   return (TRUE);
 }