Changeset 28304 for branches/czw_branch/20100519/Ohana/src/addstar

Timestamp:

Jun 10, 2010, 6:28:51 PM (16 years ago)

Author:

watersc1

Message:

Skycell Summary and stack Association stuff should be finished. I'll merge and do final tests on monday.

Location:

branches/czw_branch/20100519

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/src/ConfigInit.c (modified) (2 diffs)
• Ohana/src/addstar/src/FilterStars.c (modified) (1 diff)
• Ohana/src/addstar/src/LoadStars.c (modified) (1 diff)
• Ohana/src/addstar/src/ReadImageHeader.c (modified) (1 diff)
• Ohana/src/addstar/src/SkyTableFromTychoIndex.c (modified) (1 diff)
• Ohana/src/addstar/src/UpdateImageIDs.c (modified) (1 diff)
• Ohana/src/addstar/src/addstar.c (modified) (3 diffs)
• Ohana/src/addstar/src/find_matches.c (modified) (3 diffs)
• Ohana/src/addstar/src/find_matches_closest.c (modified) (1 diff)
• Ohana/src/addstar/src/find_matches_closest_refstars.c (modified) (1 diff)
• Ohana/src/addstar/src/find_matches_refstars.c (modified) (1 diff)
• Ohana/src/addstar/src/sky_tessalation.c (modified) (2 diffs)
• Ohana/src/addstar/test (modified) (1 prop)

branches/czw_branch/20100519/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);
 

branches/czw_branch/20100519/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 */

branches/czw_branch/20100519/Ohana/src/addstar/src/LoadStars.c

@@ -81 +81 @@
       continue;
     }
-    if (VERBOSE) fprintf (stderr, "file %s has %d headers, including %lld images\n", file[i], Nheaders, (long long) NheaderSets);
+    if (VERBOSE) fprintf (stderr, "file %s has %d headers, including "OFF_T_FMT" images\n", file[i], Nheaders,  NheaderSets);
 
     /* supplied photcode is incompatible with multi-chip images */

branches/czw_branch/20100519/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);

branches/czw_branch/20100519/Ohana/src/addstar/src/SkyTableFromTychoIndex.c

@@ -147 +147 @@
     skytable[0].filename[i] = NULL;
   }
-  if (VERBOSE) fprintf (stderr, "loaded %lld tables from tycho index\n", (long long) skytable[0].Nregions);
+  if (VERBOSE) fprintf (stderr, "loaded "OFF_T_FMT" tables from tycho index\n",  skytable[0].Nregions);
 
   return (skytable);

branches/czw_branch/20100519/Ohana/src/addstar/src/UpdateImageIDs.c

@@ -55 +55 @@
 
   if (isEmpty) {
-    dvo_image_addrows (&db, NULL, 0);
+    if (!dvo_image_addrows (&db, NULL, 0)) Shutdown ("failed to create image table");
     SetProtect (TRUE);
-    dvo_image_update (&db, VERBOSE);
+    if (!dvo_image_update (&db, VERBOSE)) Shutdown ("failed to update image table");
     SetProtect (FALSE);
   } else {

branches/czw_branch/20100519/Ohana/src/addstar/src/addstar.c

@@ -48 +48 @@
         newlist = SkyListByImage (sky, -1, &images[i]);
         SkyListMerge (&skylist, newlist);
-        if (VERBOSE) fprintf (stderr, "added %lld regions to yield %lld total\n", (long long) newlist[0].Nregions, (long long) skylist[0].Nregions);
+        if (VERBOSE) fprintf (stderr, "added "OFF_T_FMT" regions to yield "OFF_T_FMT" total\n",  newlist[0].Nregions,  skylist[0].Nregions);
         SkyListFree (newlist);
       }
@@ -80 +80 @@
     skylist = tmp;
   }
-  if (VERBOSE) fprintf (stderr, "writing to %lld regions\n", (long long) skylist[0].Nregions);
+  if (VERBOSE) fprintf (stderr, "writing to "OFF_T_FMT" regions\n",  skylist[0].Nregions);
 
   /* don't load the object tables for only_images, unless we are getting the calibration. */
@@ -213 +213 @@
   gettimeofday (&stop, NULL);
   dtime = DTIME (stop, start);
-  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars (%5d matches), %6lld average, %7lld measure\n", dtime, Nstars, Nmatch, (long long) Naverage, (long long) Nmeasure);
+  fprintf (stderr, "SUCCESS: elapsed time %9.4f sec for %5d stars (%5d matches), "OFF_T_FMT" average, "OFF_T_FMT" measure\n", dtime, Nstars, Nmatch,  Naverage,  Nmeasure);
 
   exit (0);

branches/czw_branch/20100519/Ohana/src/addstar/src/find_matches.c

@@ -3 +3 @@
 int find_matches (SkyRegion *region, Stars *stars, unsigned int NstarsIn, Catalog *catalog, AddstarClientOptions options) {
 
-  off_t i, j, n, N, J, status, Nstars;
+  off_t i, j, n, N, J, Nstars;
   double RADIUS, RADIUS2;
   double *X1, *Y1, *X2, *Y2;
@@ -9 +9 @@
   off_t *N1, *N2, *next_meas;
   off_t Nave, NAVE, Nmeas, NMEAS, Nmatch;
-  int Nsecfilt, Nsec;
+  int Nsecfilt, Nsec, status;
   unsigned int objID, catID;
   Coords tcoords;
@@ -356 +356 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nsecf_mem = Nave*Nsecfilt;
-  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
+  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
   free (catalog[0].found);

branches/czw_branch/20100519/Ohana/src/addstar/src/find_matches_closest.c

@@ -350 +350 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nsecf_mem = Nave*Nsecfilt;
-  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
+  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
   free (catalog[0].found);

branches/czw_branch/20100519/Ohana/src/addstar/src/find_matches_closest_refstars.c

@@ -361 +361 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nsecf_mem = Nave*Nsecfilt;
-  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
+  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: "OFF_T_FMT" "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
   free (catalog[0].found);

branches/czw_branch/20100519/Ohana/src/addstar/src/find_matches_refstars.c

@@ -329 +329 @@
   catalog[0].Nmeasure = Nmeas;
   catalog[0].Nsecf_mem = Nave*Nsecfilt;
-  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %lld %lld %lld, (%lld matches)\n", (long long) Nstars, (long long) Nave, (long long) Nmeas, (long long) Nmatch);
+  if (VERBOSE) fprintf (stderr, "Nstars, Nave, Nmeas: %d "OFF_T_FMT" "OFF_T_FMT", ("OFF_T_FMT" matches)\n",  Nstars,  Nave,  Nmeas,  Nmatch);
 
   free (catalog[0].found);

branches/czw_branch/20100519/Ohana/src/addstar/src/sky_tessalation.c

@@ -940 +940 @@
 int dvo_image_clear_vtable (FITS_DB *db) {
 
-  int i;
+  int i, nbytes;
 
   // free memory used by the current vtable rows
@@ -951 +951 @@
 
   // reset db[0].theader(NAXIS1) to match Image
-  gfits_modify (&db[0].theader, "NAXIS1", "%lld", 1, (long long) sizeof(Image));
+  nbytes = sizeof(Image);
+  gfits_modify (&db[0].theader, "NAXIS1", "%d", 1,  nbytes);
   db[0].theader.Naxis[0] = sizeof(Image);
 

branches/czw_branch/20100519/Ohana/src/addstar/test

@@ +1 @@
+test.cmf
 test.1.cmf
 test.2.cmf

@@ +1 @@
+test.cmf
 test.1.cmf
 test.2.cmf

@@ +1 @@
+test.cmf
 test.1.cmf
 test.2.cmf