Changeset 28214

Timestamp:

Jun 4, 2010, 8:00:11 AM (16 years ago)

Author:

eugene

Message:

fixed error in azimuth calculation (sidtime passed as hours not degrees); better warnings if STKeyword and Obseravatory Latitude are not found in config

Location:

trunk/Ohana/src/addstar/src

Files:

• ConfigInit.c (modified) (2 diffs)
• FilterStars.c (modified) (1 diff)
• ReadImageHeader.c (modified) (1 diff)

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

@@ -7 +7 @@
   double ZERO_POINT;
   char *config, *file;
-  char RadiusWord[80];
+  char RadiusWord[80], tmpword[80];
   char CatdirPhotcodeFile[256];
   char MasterPhotcodeFile[256];
@@ -68 +68 @@
   ScanConfig (config, "CCDNUM-KEYWORD",         "%s",  0, CCDNumKeyword);
   ScanConfig (config, "ST-KEYWORD",             "%s",  0, STKeyword);
-  ScanConfig (config, "OBSERVATORY-LATITUDE",   "%lf", 0, &Latitude);
-  ScanConfig (config, "OBSERVATORY-LONGITUDE",  "%lf", 0, &Longitude);
+
+  ScanConfig (config, "OBSERVATORY-LATITUDE",   "%s",  0, tmpword);
+  if (!strcasecmp(tmpword, "NONE")) {
+      fprintf (stderr, "observatory latitude is not set\n");
+      Latitude = NAN;
+  } else {
+      ScanConfig (config, "OBSERVATORY-LATITUDE",   "%lf", 0, &Latitude);
+  }
+  ScanConfig (config, "OBSERVATORY-LONGITUDE",   "%s",  0, tmpword);
+  if (!strcasecmp(tmpword, "NONE")) {
+      fprintf (stderr, "observatory longitude is not set\n");
+      Longitude = NAN;
+  } else {
+      ScanConfig (config, "OBSERVATORY-LONGITUDE",  "%lf", 0, &Longitude);
+  }
+  fprintf (stderr, "observatory @ (%f,%f)\n", Longitude, Latitude);
+
+  if (!strcasecmp(STKeyword, "NONE")) {
+      if (isnan(Longitude)) { 
+          fprintf (stderr, "WARNING: ST cannot be determined for this image (no ST Keyword, no longitude)\n");
+      } else {
+          fprintf (stderr, "ST Keyword is not defined, ST will be derived from time & longitude\n");
+      }
+  }
+
   ScanConfig (config, "SUBPIX_DATAFILE",        "%s",  0, SubpixDatafile);
 

trunk/Ohana/src/addstar/src/FilterStars.c

@@ -54 +54 @@
     /* calculate accurate per-star airmass and azimuth */
     stars[N].measure.airmass = airmass (image[0].secz, stars[N].average.R, stars[N].average.D, image[0].sidtime, image[0].latitude);
-    stars[N].measure.az      = azimuth (image[0].sidtime - stars[N].average.R, stars[N].average.D, image[0].latitude);
+    stars[N].measure.az      = azimuth (15.0*image[0].sidtime - stars[N].average.R, stars[N].average.D, image[0].latitude);
     stars[N].measure.Mcal    = image[0].Mcal;
     stars[N].measure.t       = image[0].tzero + 1e-4*stars[N].measure.Yccd*image[0].trate;  /* trate is in 0.1 msec / row */

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

@@ -148 +148 @@
   image[0].fwhm_y = tmp * 25.0 * image[0].coords.cdelt1 * 3600.0;
 
-  if (STKeyword[0]) {
+  if (STKeyword[0] && strcasecmp(STKeyword, "NONE")) {
     /* get ST (used for airmass calculation) */
     gfits_scan (header, STKeyword, "%s", 1, line);