Changeset 28241 for trunk/Ohana/src/addstar

Timestamp:

Jun 6, 2010, 4:06:31 PM (16 years ago)

Author:

eugene

Message:

merging changes from branches/eam_branches/Ohana.20100606: re-work the off_t print/scan format; fix and test NAN implementation in gnu89 context; fix and test BYTE_SWAP for libohana

Location:

trunk/Ohana

Files:

• . (modified) (1 prop)
• src/addstar/src/LoadStars.c (modified) (1 diff)
• src/addstar/src/SkyTableFromTychoIndex.c (modified) (1 diff)
• src/addstar/src/addstar.c (modified) (3 diffs)
• src/addstar/src/find_matches.c (modified) (1 diff)
• src/addstar/src/find_matches_closest.c (modified) (1 diff)
• src/addstar/src/find_matches_closest_refstars.c (modified) (1 diff)
• src/addstar/src/find_matches_refstars.c (modified) (1 diff)
• src/addstar/src/sky_tessalation.c (modified) (2 diffs)

trunk/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 */

trunk/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);

trunk/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);

trunk/Ohana/src/addstar/src/find_matches.c

@@ -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);

trunk/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);

trunk/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);

trunk/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);

trunk/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);