Changeset 28241 for trunk/Ohana/src/relastro

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/relastro/src/ImageOps.c (modified) (1 diff)
• src/relastro/src/UpdateChips.c (modified) (1 diff)
• src/relastro/src/UpdateObjects.c (modified) (3 diffs)
• src/relastro/src/bcatalog.c (modified) (1 diff)
• src/relastro/src/high_speed_objects.c (modified) (4 diffs)
• src/relastro/src/select_images.c (modified) (2 diffs)

trunk/Ohana/src/relastro/src/ImageOps.c

@@ -165 +165 @@
   for (i = 0; VERBOSE2 && (i < Nimage); i++) {
     name = GetPhotcodeNamebyCode (image[i].photcode);
-    fprintf (stderr, "image %lld has %lld measures (%s, %s)\n", (long long) i, (long long) Nlist[i],
+    fprintf (stderr, "image "OFF_T_FMT" has "OFF_T_FMT" measures (%s, %s)\n",  i,  Nlist[i],
              ohana_sec_to_date(image[i].tzero), name);
   }

trunk/Ohana/src/relastro/src/UpdateChips.c

@@ -30 +30 @@
 
     // FitChip does iterative, clipped fitting
-    // fprintf (stderr, "image %lld : Nstars: %lld\n", (long long) i, (long long) Nraw);
+    // fprintf (stderr, "image "OFF_T_FMT" : Nstars: "OFF_T_FMT"\n",  i,  Nraw);
     if (!FitChip (raw, ref, Nraw, &image[i].coords)) {
-      fprintf (stderr, "reject fit for image %s (%lld) : Nstars: %lld\n", image[i].name, (long long) i, (long long) Nraw);
+      fprintf (stderr, "reject fit for image %s ("OFF_T_FMT") : Nstars: "OFF_T_FMT"\n", image[i].name,  i,  Nraw);
       oldCoords = getCoords (i);
       memcpy (&image[i].coords, oldCoords, sizeof(Coords));

trunk/Ohana/src/relastro/src/UpdateObjects.c

@@ -80 +80 @@
   for (i = 0; i < Ncatalog; i++) {
 
-    if (VERBOSE) fprintf (stderr, "astrometrize catalog %d : %lld ave, %lld meas\n", i, (long long) catalog[i].Naverage, (long long) catalog[i].Nmeasure);
+    if (VERBOSE) fprintf (stderr, "astrometrize catalog %d : "OFF_T_FMT" ave, "OFF_T_FMT" meas\n", i,  catalog[i].Naverage,  catalog[i].Nmeasure);
 
     Nave = Npar = Npm = Nskip = 0;
@@ -189 +189 @@
           T[k] -= Tmean;
           if (XVERB) {
-            fprintf (stderr, "%lld %f %f %f  %f %f +/- %f %f\n", (long long) k, T[k], R[k], D[k], X[k], Y[k], dX[k], dY[k]);
+            fprintf (stderr, OFF_T_FMT" %f %f %f  %f %f +/- %f %f\n",  k, T[k], R[k], D[k], X[k], Y[k], dX[k], dY[k]);
           }
         }         
@@ -316 +316 @@
     NparSum += Npar;
     NskipSum += Nskip;
-    if (VERBOSE) fprintf (stderr, "catalog %lld : %lld ave, %lld pm, %lld par : Nskip %lld\n", (long long) i, (long long) Nave, (long long) Npm, (long long) Npar, (long long) Nskip);
+    if (VERBOSE) fprintf (stderr, "catalog %d : "OFF_T_FMT" ave, "OFF_T_FMT" pm, "OFF_T_FMT" par : Nskip "OFF_T_FMT"\n",  i,  Nave,  Npm,  Npar,  Nskip);
   }
 
-  fprintf (stderr, "fitted %lld objects (%lld ave, %lld pm, %lld par), skipped %lld\n", (long long) (NaveSum + NpmSum + NparSum), (long long) NaveSum, (long long) NpmSum, (long long) NparSum, (long long) NskipSum);
+  fprintf (stderr, "fitted "OFF_T_FMT" objects ("OFF_T_FMT" ave, "OFF_T_FMT" pm, "OFF_T_FMT" par), skipped "OFF_T_FMT"\n",  (NaveSum + NpmSum + NparSum),  NaveSum,  NpmSum,  NparSum,  NskipSum);
   return (TRUE);
 }

trunk/Ohana/src/relastro/src/bcatalog.c

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

trunk/Ohana/src/relastro/src/high_speed_objects.c

@@ -61 +61 @@
   memset (groupB, 0, catalog[0].Naverage*sizeof(int));
 
-  fprintf (stderr, "checking %lld objects\n", (long long) catalog[0].Naverage);
+  fprintf (stderr, "checking "OFF_T_FMT" objects\n",  catalog[0].Naverage);
   Nslow = 0;
 
@@ -142 +142 @@
         continue;
       } else {
-        // fprintf (stderr, "skip %lld (group A)\n", (long long) i);
+        // fprintf (stderr, "skip "OFF_T_FMT" (group A)\n",  i);
       }
     }
@@ -189 +189 @@
         continue;
       } else {
-        // fprintf (stderr, "skip %lld (group B)\n", (long long) i);
+        // fprintf (stderr, "skip "OFF_T_FMT" (group B)\n",  i);
       }
     }
@@ -197 +197 @@
     Nslow ++;
   }
-  fprintf (stderr, "%lld of %lld are slow or invalid; %lld in group A, %lld in group B\n", (long long) Nslow, (long long) catalog[0].Naverage, (long long) NgroupA, (long long) NgroupB);
+  fprintf (stderr, OFF_T_FMT" of "OFF_T_FMT" are slow or invalid; "OFF_T_FMT" in group A, "OFF_T_FMT" in group B\n",  Nslow,  catalog[0].Naverage,  NgroupA,  NgroupB);
     
   // double loop over unmarked objects (sorted in RA / X)

trunk/Ohana/src/relastro/src/select_images.c

@@ -115 +115 @@
     
     if (!FindMosaicForImage (timage, Ntimage, i)) {
-      fprintf (stderr, "cannot find mosaic for %lld\n", (long long) i);
+      fprintf (stderr, "cannot find mosaic for "OFF_T_FMT"\n",  i);
       continue;
     }
@@ -190 +190 @@
   }
       
-  if (VERBOSE) fprintf (stderr, "found %lld images\n", (long long) nimage);
+  if (VERBOSE) fprintf (stderr, "found "OFF_T_FMT" images\n",  nimage);
 
   REALLOCATE (image, Image, MAX (nimage, 1));