Changeset 28241 for trunk/Ohana/src/dvomerge

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/dvomerge/src/dvo_image_merge_dbs.c (modified) (3 diffs)
• src/dvomerge/src/dvoconvert.c (modified) (1 diff)
• src/dvomerge/src/merge_catalogs_new.c (modified) (1 diff)
• src/dvomerge/src/merge_catalogs_old.c (modified) (5 diffs)

trunk/Ohana/src/dvomerge/src/dvo_image_merge_dbs.c

@@ -17 +17 @@
  /* adjust header */
   Nout = 0;
-  gfits_scan (&out[0].header, "NIMAGES", "%lld", 1, (long long *) &Nout);
-  status = gfits_scan (&out[0].header, "IMAGEID", "%lld", 1, (long long *) &IDstart);
+  gfits_scan (&out[0].header, "NIMAGES", OFF_T_FMT, 1,  &Nout);
+  status = gfits_scan (&out[0].header, "IMAGEID", OFF_T_FMT, 1,  &IDstart);
   if (!status) {
     IDstart = 1;
@@ -36 +36 @@
   Nout += Nimages;
   IDstart += Nimages;
-  gfits_modify (&out[0].header, "NIMAGES", "%lld", 1, (long long) Nout);
-  gfits_modify (&out[0].header, "IMAGEID", "%lld", 1, (long long) IDstart);
+  gfits_modify (&out[0].header, "NIMAGES", OFF_T_FMT, 1,  Nout);
+  gfits_modify (&out[0].header, "IMAGEID", OFF_T_FMT, 1,  IDstart);
 
   gfits_add_rows (&out[0].ftable, (char *) images, Nimages, sizeof(Image));
@@ -65 +65 @@
     newID = dvo_map_image_ID (IDmap, oldID);
     if (newID == 0) {
-      fprintf (stderr, "cannot find image ID %lld\n", (long long) oldID);
+      fprintf (stderr, "cannot find image ID "OFF_T_FMT"\n",  oldID);
       exit (2);
     }

trunk/Ohana/src/dvomerge/src/dvoconvert.c

@@ -150 +150 @@
 
   // update additional metadata
-  gfits_scan (&inDB.header, "IMAGEID", "%lld", 1, (long long *) &ID);
-  gfits_modify (&outDB.header, "NIMAGES", "%lld", 1, (long long) Nimages);
-  gfits_modify (&outDB.header, "IMAGEID", "%lld", 1, (long long) ID);
+  gfits_scan (&inDB.header, "IMAGEID", OFF_T_FMT, 1,  &ID);
+  gfits_modify (&outDB.header, "NIMAGES", OFF_T_FMT, 1,  Nimages);
+  gfits_modify (&outDB.header, "IMAGEID", OFF_T_FMT, 1,  ID);
 
   // copy input rows to output table

trunk/Ohana/src/dvomerge/src/merge_catalogs_new.c

@@ -72 +72 @@
   
   if (VERBOSE) {
-      fprintf (stderr, "%lld: using %lld stars (%lld measures) for catalog\n", 
-               (long long) i, 
-               (long long) output[0].Naverage, 
-               (long long) output[0].Nmeasure);
+      fprintf (stderr, OFF_T_FMT": using "OFF_T_FMT" stars ("OFF_T_FMT" measures) for catalog\n", 
+                i, 
+                output[0].Naverage, 
+                output[0].Nmeasure);
   }
   return (TRUE);

trunk/Ohana/src/dvomerge/src/merge_catalogs_old.c

@@ -183 +183 @@
       output[0].measure[Nmeas].catID    = output[0].catID;
 
-      // fprintf (stderr, "Nave : %lld, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", (long long) n, (long long) Nmeas, output[0].measure[Nmeas].dR, output[0].measure[Nmeas].dD, output[0].measure[i].catID);
+      // fprintf (stderr, "Nave : "OFF_T_FMT", Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n",  n,  Nmeas, output[0].measure[Nmeas].dR, output[0].measure[Nmeas].dD, output[0].measure[i].catID);
 
       // rationalize dR
@@ -216 +216 @@
   fprintf (stderr, "--- 1 ---\n");
   for (i = 0; i < Nmeas; i++) {
-    fprintf (stderr, "Nave : %d, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, (long long) i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
+    fprintf (stderr, "Nave : %d, Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef,  i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
   }
 # endif
@@ -321 +321 @@
   fprintf (stderr, "--- 2 ---\n");
   for (i = 0; i < Nmeas; i++) {
-    fprintf (stderr, "Nave : %d, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, (long long) i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
+    fprintf (stderr, "Nave : %d, Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef,  i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
   }
 # endif
@@ -336 +336 @@
   fprintf (stderr, "--- 3 ---\n");
   for (i = 0; i < Nmeas; i++) {
-    fprintf (stderr, "Nave : %d, Nmeas : %lld, dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef, (long long) i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
+    fprintf (stderr, "Nave : %d, Nmeas : "OFF_T_FMT", dR: %f, dD: %f, catID: %d\n", output[0].measure[i].averef,  i, output[0].measure[i].dR, output[0].measure[i].dD, output[0].measure[i].catID);
   }
 # endif
@@ -354 +354 @@
   output[0].Nmeasure = Nmeas;
   output[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 (next_meas);