Changeset 28241 for trunk/Ohana/src/relphot

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/relphot/src/GridOps.c (modified) (1 diff)
• src/relphot/src/ImageOps.c (modified) (1 diff)
• src/relphot/src/MosaicOps.c (modified) (5 diffs)
• src/relphot/src/StarOps.c (modified) (1 diff)
• src/relphot/src/bcatalog.c (modified) (6 diffs)
• src/relphot/src/load_catalogs.c (modified) (1 diff)
• src/relphot/src/load_images.c (modified) (1 diff)
• src/relphot/src/relphot_objects.c (modified) (1 diff)
• src/relphot/src/select_images.c (modified) (2 diffs)
• src/relphot/src/setExclusions.c (modified) (1 diff)
• src/relphot/src/setMrelFinal.c (modified) (1 diff)

trunk/Ohana/src/relphot/src/GridOps.c

@@ -703 +703 @@
   gfits_create_header (&header);
   gfits_create_matrix (&header, &matrix);
-  gfits_modify (&header, "NEXTEND", "%lld", 1, (long long) Nimage + 3);
+  gfits_modify (&header, "NEXTEND", OFF_T_FMT, 1,  Nimage + 3);
   gfits_modify (&header, "FILTER", "%s", 1, photcode[0].name);
   gfits_modify_alt (&header, "COMMENT", "%S", 1, "Mosaic Photometry Grid Analysis");

trunk/Ohana/src/relphot/src/ImageOps.c

@@ -200 +200 @@
     status = findCCD (idx, meas, cat, measure);
     if (!status) {
-      if (VERBOSE2) fprintf (stderr, "failed to determine CCD for %lld, %d\n", (long long) meas, cat);
+      if (VERBOSE2) fprintf (stderr, "failed to determine CCD for "OFF_T_FMT", %d\n",  meas, cat);
       return;
     }

trunk/Ohana/src/relphot/src/MosaicOps.c

@@ -400 +400 @@
       mark = (N < IMAGE_TOOFEW) || (N < IMAGE_GOOD_FRACTION*Nlist[i]);
       if (mark) {
-        fprintf (stderr, "marked mosaic %s (%lld), (%lld < %d) || (%lld < %f*%lld)\n", image[imlist[i][0]].name, (long long) i, (long long) N, IMAGE_TOOFEW, (long long) N, IMAGE_GOOD_FRACTION, (long long) Nlist[i]);
+        fprintf (stderr, "marked mosaic %s ("OFF_T_FMT"), ("OFF_T_FMT" < %d) || ("OFF_T_FMT" < %f*"OFF_T_FMT")\n", image[imlist[i][0]].name,  i,  N, IMAGE_TOOFEW,  N, IMAGE_GOOD_FRACTION,  Nlist[i]);
         mosaic[i].flags |= ID_IMAGE_FEW;
         Nfew ++;
@@ -408 +408 @@
     }
     liststats (list, dlist, N, &stats);
-    if (PoorImages) fprintf (stderr, "Mmos: %f %f %d %lld\n", stats.mean, stats.sigma, stats.Nmeas, (long long) N);
+    if (PoorImages) fprintf (stderr, "Mmos: %f %f %d "OFF_T_FMT"\n", stats.mean, stats.sigma, stats.Nmeas,  N);
     mosaic[i].Mcal  = stats.mean;
     mosaic[i].dMcal = stats.sigma;
@@ -519 +519 @@
     n++;
   }
-  fprintf (stderr, "Nmosaic: %lld, n: %lld\n", (long long) Nmosaic, (long long) n);
+  fprintf (stderr, "Nmosaic: "OFF_T_FMT", n: "OFF_T_FMT"\n",  Nmosaic,  n);
 
   liststats (list, dlist, n, &stats);
@@ -599 +599 @@
   }
 
-  fprintf (stderr, "%lld mosaics marked poor\n", (long long) Nmark);
+  fprintf (stderr, OFF_T_FMT" mosaics marked poor\n",  Nmark);
   initstats (STATMODE);
   free (mlist);
@@ -643 +643 @@
     }
   
-    sprintf (string, "Mosaic %lld", (long long) i);
+    sprintf (string, "Mosaic "OFF_T_FMT,  i);
     plot_defaults (&graphdata);
     plot_list (&graphdata, xlist, ylist, N, string, NULL);

trunk/Ohana/src/relphot/src/StarOps.c

@@ -502 +502 @@
   }
   initstats (STATMODE);
-  if (VERBOSE) fprintf (stderr, "%lld measures marked poor, %lld total\n", (long long) Ndel, (long long) Nave);
+  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measures marked poor, "OFF_T_FMT" total\n", Ndel, Nave);
   free (ilist);
   free (tlist);

trunk/Ohana/src/relphot/src/bcatalog.c

@@ -7 +7 @@
   off_t NAVERAGE, NMEASURE, Naverage, Nmeasure, Nm;
   float mag;
+  int Ncode, Ntime, Ndophot, Nmag, Nsigma, Nimag, Nfew;
 
   // XXX PhotNsec as a global is a bad idea; either get it from catalog
@@ -20 +21 @@
   ALLOCATE (subcatalog[0].measure, Measure, NMEASURE);
   Nmeasure = Naverage = 0;
+
+  Ncode = Ntime = Ndophot = Nmag = Nsigma = Nimag = Nfew = 0;
 
   /* exclude stars not in range or with too few measurements */
@@ -46 +49 @@
       /* select measurements by photcode */
       ecode = GetPhotcodeEquivCodebyCode (catalog[0].measure[offset].photcode);
-      if (ecode != photcode[0].code) continue;
+      if (ecode != photcode[0].code) { Ncode ++; continue; }
 
       /* select measurements by time */
       if (TimeSelect) {
-        if (catalog[0].measure[offset].t < TSTART) continue;
-        if (catalog[0].measure[offset].t > TSTOP) continue;
+        if (catalog[0].measure[offset].t < TSTART) { Ntime ++; continue; }
+        if (catalog[0].measure[offset].t > TSTOP)  { Ntime ++; continue; }
       }
 
@@ -57 +60 @@
       // XXX ignore this criterion for REF measurements?
       // XXX chnage this to select by bitflags
-      if (DophotSelect && ((catalog[0].measure[offset].photFlags >> 16) != DophotValue)) continue;
+      if (DophotSelect && ((catalog[0].measure[offset].photFlags >> 16) != DophotValue)) { Ndophot ++; continue; }
 
       /* select measurements by mag limit */
       mag = PhotCat (&catalog[0].measure[offset]);
-      if (mag > MAG_LIM) continue;
+      if (mag > MAG_LIM) { Nmag ++; continue; } 
 
       /* select measurements by measurement error */
-      if ((SIGMA_LIM > 0) && (catalog[0].measure[offset].dM > SIGMA_LIM)) continue;
+      if ((SIGMA_LIM > 0) && (catalog[0].measure[offset].dM > SIGMA_LIM)) { Nsigma ++; continue; }
 
       /* select measurements by mag limit */
       if (ImagSelect) {
         mag = PhotInst (&catalog[0].measure[offset]);
-        if (mag < ImagMin) continue;
-        if (mag > ImagMax) continue;
+        if (mag < ImagMin) { Nimag ++; continue; }
+        if (mag > ImagMax) { Nimag ++; continue; }
       }
 
@@ -94 +97 @@
     if (Nm <= STAR_TOOFEW) { /* enough measurements in band? */
       Nmeasure -= Nm;
+      Nfew ++;
       continue; 
     }
@@ -114 +118 @@
 
   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, "using "OFF_T_FMT" stars ("OFF_T_FMT" measures) of "OFF_T_FMT" for catalog\n", 
+              subcatalog[0].Naverage,  subcatalog[0].Nmeasure,  i);
+    fprintf (stderr, "rejections: %d code, %d time, %d dophot, %d mag, %d sigma, %d imag, %d few\n", 
+             Ncode, Ntime, Ndophot, Nmag, Nsigma, Nimag, Nfew);
   }
   return (TRUE);

trunk/Ohana/src/relphot/src/load_catalogs.c

@@ -47 +47 @@
 
   fprintf (stderr, "using %d of %d stars (%d of %d measurements)\n", Nstar, Nstar_total, Nmeas, Nmeas_total);
+  if (Nstar < 1) {
+      Shutdown ("ERROR: no stars match the minimum requirements; exiting\n");
+  }
 
   // XXX consider only returning the populated catalogs

trunk/Ohana/src/relphot/src/load_images.c

@@ -47 +47 @@
   vtable = &db[0].vtable;
 
-  gfits_scan (vtable[0].header, "NAXIS1", "%lld", 1, (long long *) &Nx);
+  gfits_scan (vtable[0].header, "NAXIS1", OFF_T_FMT, 1,  &Nx);
   for (i = 0; i < Nimage; i++) {
     memcpy (vtable[0].buffer[i], &image[i], Nx);

trunk/Ohana/src/relphot/src/relphot_objects.c

@@ -55 +55 @@
         for (k = 0; k < catalog.average[j].Nmeasure; k++) {
           catalog.measure[m+k].dbFlags = 0;
+          catalog.measure[m+k].Mcal = 0;
         }
       }

trunk/Ohana/src/relphot/src/select_images.c

@@ -101 +101 @@
     
     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;
     }
@@ -175 +175 @@
   }
       
-  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));

trunk/Ohana/src/relphot/src/setExclusions.c

@@ -50 +50 @@
     }
   }
-  if (VERBOSE) fprintf (stderr, "%lld measurements marked by area\n",    (long long) Narea);
-  if (VERBOSE) fprintf (stderr, "%lld measurements marked nocal\n",      (long long) Nnocal);
-  if (VERBOSE) fprintf (stderr, "%lld measurements kept for analysis\n", (long long) Ngood);
+  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measurements marked by area\n",    Narea);
+  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measurements marked nocal\n",      Nnocal);
+  if (VERBOSE) fprintf (stderr, OFF_T_FMT" measurements kept for analysis\n", Ngood);
   return (TRUE);
 }

trunk/Ohana/src/relphot/src/setMrelFinal.c

@@ -138 +138 @@
     }
   }
-  if (VERBOSE) fprintf (stderr, "pass %d, Ntot: %lld, Ntry: %lld, Nskip: %lld, Nkeep: %lld\n",
-                        pass, (long long) Ntot, (long long) Ntry, (long long) Nskip, (long long) Nkeep);
+  if (VERBOSE) fprintf (stderr, "pass %d, Ntot: "OFF_T_FMT", Ntry: "OFF_T_FMT", Nskip: "OFF_T_FMT", Nkeep: "OFF_T_FMT"\n",
+                        pass, Ntot, Ntry, Nskip, Nkeep);
 }