Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/Ohana

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/addstar/include/skycells.h (modified) (1 diff)
• Ohana/src/addstar/src/args_skycells.c (modified) (1 diff)
• Ohana/src/addstar/src/load_subpix.c (modified) (1 diff)
• Ohana/src/addstar/src/sky_tessalation.c (modified) (4 diffs)
• Ohana/src/getstar/src/Shutdown.c (modified) (1 diff)
• Ohana/src/libfits/Makefile (modified) (1 diff)
• Ohana/src/libfits/extern/gzip.c (copied) (copied from trunk/Ohana/src/libfits/extern/gzip.c )
• Ohana/src/libfits/matrix/F_compress_M.c (modified) (2 diffs)
• Ohana/src/libfits/matrix/F_uncompress_data.c (modified) (2 diffs)
• Ohana/src/libohana/doc/kahan-gji.pdf (copied) (copied from trunk/Ohana/src/libohana/doc/kahan-gji.pdf )
• Ohana/src/libohana/src/gaussj.c (modified) (6 diffs)
• Ohana/src/opihi/cmd.astro/coord_systems.c (modified) (1 diff)
• Ohana/src/opihi/cmd.data/fit1d.c (modified) (1 diff)
• Ohana/src/opihi/cmd.data/gaussj.c (modified) (2 diffs)
• Ohana/src/opihi/cmd.data/init.c (modified) (1 diff)
• Ohana/src/opihi/dimm/camera_cmds.c (modified) (1 prop)
• Ohana/src/opihi/dimm/telescope_cmds.c (modified) (1 prop)
• Ohana/src/opihi/dvo/avextract.c (modified) (1 diff)
• Ohana/src/opihi/dvo/gstar.c (modified) (10 diffs)
• Ohana/src/opihi/dvo/mextract.c (modified) (1 diff)
• Ohana/src/opihi/dvo/mmextract.c (modified) (1 diff)
• Ohana/src/opihi/lib.shell/gprint.c (modified) (1 diff)
• Ohana/src/tools/src/fields.c (modified) (2 diffs)

branches/cnb_branches/cnb_branch_20090301/Ohana/src/addstar/include/skycells.h

@@ -98 +98 @@
 int          sky_triangle_coords            PROTO((SkyTriangle *triangle));
 
-SkyRectangle *sky_rectangle_ring            PROTO((float dec, float dDEC, int *nring));
+SkyRectangle *sky_rectangle_ring            PROTO((float dec, float dDEC, int *nring, char *format));
 
 SkyTriangle *sky_divide_triangles           PROTO((SkyTriangle *in, int *ntriangles));

branches/cnb_branches/cnb_branch_20090301/Ohana/src/addstar/src/args_skycells.c

@@ -182 +182 @@
 
   fprintf (stderr, "  -mode (name)                : define the type of tessellation.  available options are:\n");
-  fprintf (stderr, "     SQUARE                   : generate rectangular skycells using icosahedron base solid (default)\n");
+  fprintf (stderr, "     SQUARE                   : generate rectangular skycells using base solid (default)\n");
   fprintf (stderr, "     TRIANGLE                 : generate triangular skycells using icosahedron base solid\n");
+  fprintf (stderr, "     RINGS                    : generate rectangular skycells using declination strips\n");
   fprintf (stderr, "     LOCAL                    : generate a local tessellation around a spot on the sky\n");
   fprintf (stderr, "                                 (Note that this tessellation does not cover the full sky)\n");
-  fprintf (stderr, "  -solid (name)               : specify the base solid\n");
+  fprintf (stderr, "  -solid (name)               : specify the base solid (default: ICOSAHEDRON)\n");
   fprintf (stderr, "                                value may be one of: TETRAHEDRON, CUBE, OCTOHEDRON, DODECAHEDRON, ICOSAHEDRON\n");
   fprintf (stderr, "                                for convenience, only the first 4 characters are required\n");

branches/cnb_branches/cnb_branch_20090301/Ohana/src/addstar/src/load_subpix.c

@@ -22 +22 @@
 
   for (i = 0; i < Nsubpix; i++) {
-    fscanf (f, "%*s %*s %lf %lf %lf %*s\n", 
-            &Subpix[i].Amp, &Subpix[i].Phase, &Subpix[i].dM);
+      if (fscanf (f, "%*s %*s %lf %lf %lf %*s\n",
+                  &Subpix[i].Amp, &Subpix[i].Phase, &Subpix[i].dM) != 3) {
+          Shutdown("can't read subpix datafile %s", SubpixDatafile);
+      }
   }
   fclose (f);

branches/cnb_branches/cnb_branch_20090301/Ohana/src/addstar/src/sky_tessalation.c

@@ -231 +231 @@
 int sky_tessellation_rings (FITS_DB *db, int level, int Nmax) {
 
-  int j, nDEC, Nimage, Nring;
+  int j, nDEC, Nimage, Nring, Ntotal, Ndigit;
   float dec, dDEC;
   SkyRectangle *ring;
   Image *image;
+  char format[16];
 
   // The tessellation has one input parameter: the approximate cell size.  Starting with
@@ -246 +247 @@
   nDEC += 2;
 
-  // a test
-  // for (dec = 0.0 + 0.5*dDEC; dec < +90.0; dec += dDEC) {
+  // how many total projection cells for this realization?  divide sky area by cell area:
+  // this is used to set the number of digits, so it does not need to be very accurate...
+  Ntotal = 41254.2 / (dDEC*dDEC);
+  Ndigit = (int)(log10(Ntotal)) + 1 ;
+  snprintf (format, 16, "skycell.%%0%dd", Ndigit);
 
   // generate the a collection of rectangles for each ring
   for (dec = -90.0; dec < +90.0 + 0.5*dDEC; dec += dDEC) {
 
-    ring = sky_rectangle_ring (dec, dDEC, &Nring);
+    ring = sky_rectangle_ring (dec, dDEC, &Nring, format);
     if (!ring) continue;
 
@@ -534 +538 @@
 
 // define the parameters of a single sky projection center
-SkyRectangle *sky_rectangle_ring (float dec, float dDEC, int *nring) {
-
+SkyRectangle *sky_rectangle_ring (float dec, float dDEC, int *nring, char *format) {
+
+  static int Nname = 0;
   int i, NX, NY, nRA;
   SkyRectangle *ring;
@@ -631 +636 @@
     strcpy (ring[i].coords.ctype, "DEC--TAN");
 
-    ring[i].NX = NX;
-    ring[i].NY = NY;
+    ring[i].NX = NX*(1.0 + PADDING);
+    ring[i].NY = NY*(1.0 + PADDING);
     ring[i].photcode = 1; // this needs to be set more sensibly
 
+    snprintf (ring[i].name, DVO_IMAGE_NAME_LEN, format, Nname);
+    Nname++;
 
     // fprintf (stderr, "%f %f  : %f %f\n", 

branches/cnb_branches/cnb_branch_20090301/Ohana/src/getstar/src/Shutdown.c

@@ -21 +21 @@
   va_end (argp);
 
+  if (!db) { exit (2); }
   SetProtect (TRUE);
   gfits_db_close (db);

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libfits/Makefile

@@ -60 +60 @@
 $(EXT)/fits_hdecompress.$(ARCH).o \
 $(EXT)/pliocomp.$(ARCH).o \
-$(EXT)/ricecomp.$(ARCH).o
+$(EXT)/ricecomp.$(ARCH).o \
+$(EXT)/gzip.$(ARCH).o
 
 OBJS = $(HEADER_OBJ) $(MATRIX_OBJ) $(TABLE_OBJ) $(EXTERN_OBJ)

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libfits/matrix/F_compress_M.c

@@ -248 +248 @@
     // XXX not certain this is the correct place to do the swap (or if zdata_pixsize is
     // the correct size to guide the swap)
-    if (!gfits_byteswap_zdata (zdata, Nzdata, zdata_pixsize)) return (FALSE);
+
+    if (strcasecmp(cmptype, "GZIP_1")) {
+      if (!gfits_byteswap_zdata (zdata, Nzdata, zdata_pixsize)) return (FALSE);
+    }
 
     // gfits_uncompress_data uncompresses from zdata to the temporary output buffer which must be allocated
@@ -496 +499 @@
 
   if (!strcasecmp(cmptype, "GZIP_1")) {
-    return (4);
+    if (out_bitpix == 8)  return (1);
+    if (out_bitpix == 16) return (2);
+    if (out_bitpix == 32) return (4);
+    if (out_bitpix == -32) return (4);
+    if (out_bitpix == -64) return (8);
+    return (1);
   }
   if (!strcasecmp(cmptype, "RICE_1")) {

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libfits/matrix/F_uncompress_data.c

@@ -22 +22 @@
 int pl_l2pi (short *ll_src, int xs, int *px_dst, int npix);
 
+/* functions defined in gzip.c */
+int gfits_gz_stripheader (unsigned char *data, int *ndata);
+int gfits_uncompress (Bytef *dest, uLongf *destLen, const Bytef *source, uLong sourceLen);
+
 int gfits_uncompress_data (char *zdata, int Nzdata, char *cmptype, char **optname, char **optvalue, int Nopt, char *outdata, int *Nout, int out_pixsize) {
 
@@ -30 +34 @@
   if (!strcasecmp(cmptype, "GZIP_1")) {
     unsigned long tNout = *Nout * out_pixsize;
+
+    // for GZIP data, I need to check for and remove the header on the first block:
+    gfits_gz_stripheader ((unsigned char *)zdata, &Nzdata);
+
     // uncompress does not require us to know the expected number of pixel; it tells us the number
-    status = uncompress ((Bytef *) outdata, &tNout, (Bytef *) zdata, Nzdata);
+    status = gfits_uncompress ((Bytef *) outdata, &tNout, (Bytef *) zdata, Nzdata);
     if (status != Z_OK) {
       fprintf (stderr, "error in uncompress (GZIP)\n");
       return (FALSE);
     }
-    *Nout = tNout;
+    *Nout = tNout / out_pixsize;
+
+    // the resulting uncompressed data is byteswapped
+    if (!gfits_byteswap_zdata (outdata, *Nout, out_pixsize)) return (FALSE);
+
     return (TRUE);
   }

branches/cnb_branches/cnb_branch_20090301/Ohana/src/libohana/src/gaussj.c

@@ -1 +1 @@
 # include <ohana.h>
+# define GROWTHTEST 0
+# define MAX_RANGE 1.0e7
 
 // Gauss-Jordan elimination using full pivots based on Press et al's description.  Substantially
 // reworked for Ohana: major modifications to conform to C indexing, use a boolean to track the
 // completed pivot rows and catch the singular matrix early on.  Also, much cleaner control loops
-// than their implementation.  XXX this really needs to check on round-off errors (see version by
-// William Kahan
+// than their implementation.  (largely based on version by William Kahan)
+
+// MAX_RANGE is used to test for ill-conditioned input matrices.  For an ill-conditioned
+// matrix, one or more of the pivots trends towards zero.  Rather than allow this to go to the
+// numerical precision, I am raising an error if |growth| > 1e8
 int dgaussjordan (double **A, double **B, int N, int M) {
 
@@ -19 +24 @@
   memset (pivot, 0, N*sizeof(int));
 
+  double growth = 1.0;
+
   // determine underflow conditions
   // double underFlow = DBL_MIN;
-# if (0)
+# if (GROWTHTEST)
   double roundTest = 4.0;
   roundTest /= 3.0;
   roundTest -= 1.0;
   double epsilon = fabs(((roundTest+roundTest) - 1.0) + roundTest);
-  double growth = 1.0;
 # endif
 
@@ -57 +63 @@
     }
 
+# if (GROWTHTEST)
+    fprintf (stderr, "maxcol: %d\n", maxcol);
+    fprintf (stderr, "full A matrix:\n");
+    for (row = 0; row < N; row++) {
+        for (col = 0; col < N; col++) {
+            fprintf (stderr, "%10.3e ", A[row][col]);
+        }
+        fprintf (stderr, "\n");
+    }
+    fprintf (stderr, "\n");
+# endif
+
     // if pivot[maxcol] is set, we have already done this row: this implies a singular matrix
     if (pivot[maxcol]) goto escape;
@@ -76 +94 @@
     for (col = 0; col < N; col++) A[maxcol][col] *= tmpval;
     for (col = 0; col < M; col++) B[maxcol][col] *= tmpval;
-    // XXX measure the pivot growth and trigger on over/under flow
-    // growth *= tmpval;
-    // fprintf (stderr, "column: %d, growth: %e, epsilon: %e\n", maxcol, growth, epsilon);
+
+    // check for ill-conditioned matrix
+    growth *= tmpval;
+
+    // report the pivot growth
+#   if (GROWTHTEST)
+    fprintf (stderr, "column: %d, maxval : %f, growth: %e, epsilon: %e\n", maxcol, tmpval, growth, epsilon);
+    fprintf (stderr, "A diagonal: ");
+    for (col = 0; col < N; col++) fprintf (stderr, "%f ", A[col][col]);
+    fprintf (stderr, "\n");
+# endif
+
+    if (fabs(growth) > MAX_RANGE) goto escape;
 
     /* adjust the elements above the pivot */
@@ -122 +150 @@
   memset (pivot, 0, N*sizeof(int));
 
+  float growth = 1.0;
+
   // determine underflow conditions
   // float underFlow = FLT_MIN;
-# if (0)
+# if (GROWTHTEST)
   float roundTest = 4.0;
   roundTest /= 3.0;
   roundTest -= 1.0;
   float epsilon = fabs(((roundTest+roundTest) - 1.0) + roundTest);
-  float growth = 1.0;
 # endif
 
@@ -179 +208 @@
     for (col = 0; col < N; col++) A[maxcol][col] *= tmpval;
     for (col = 0; col < M; col++) B[maxcol][col] *= tmpval;
-    // growth *= tmpval;
-    // fprintf (stderr, "column: %d, growth: %e, epsilon: %e\n", maxcol, growth, epsilon);
+
+    // check for ill-conditioned matrix
+    growth *= tmpval;
+
+    // report the pivot growth
+#   if (GROWTHTEST)
+    fprintf (stderr, "column: %d, maxval : %f, growth: %e, epsilon: %e\n", maxcol, tmpval, growth, epsilon);
+    fprintf (stderr, "A diagonal: ");
+    for (col = 0; col < N; col++) fprintf (stderr, "%f ", A[col][col]);
+    fprintf (stderr, "\n");
+# endif
+
+    if (fabs(growth) > MAX_RANGE) goto escape;
 
     /* adjust the elements above the pivot */

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/cmd.astro/coord_systems.c

@@ -123 +123 @@
   // atan2 returns -pi : +pi
   *x = DEG_RAD * atan2 (sin_x, cos_x) + transform->xo;
-  if ((*x) < 0.0) (*x) += 360;
+  if ((*x) <   0.0) (*x) += 360;
+  if ((*x) > 360.0) (*x) -= 360;
 
   // should be in range -pi/2 : +pi/2

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/cmd.data/fit1d.c

@@ -125 +125 @@
       }
     }
-    if (!dgaussjordan (c, b, nterm, 1)) goto escape;
+    if (!dgaussjordan (c, b, nterm, 1)) {
+        gprint (GP_ERR, "failed to fit data : ill-conditioned matrix\n");
+        goto escape;
+    }
 
     /* generate fitted values */

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/cmd.data/gaussj.c

@@ -47 +47 @@
   status = dgaussjordan (a, b, N, 1);
 
-  // output vector needs to be float, so re-cast it
-  ResetVector (B, OPIHI_FLT, N);
-  vf = B[0].elements.Flt;
+  // if dgaussjordan succeeds, replace the input values with the results
+  if (status) {
+    // output vector needs to be float, so re-cast it
+    ResetVector (B, OPIHI_FLT, N);
+    vf = B[0].elements.Flt;
 
-  for (i = 0; i < N; i++) {
-    for (j = 0; j < N; j++) {
-       m[i+j*N] = a[i][j];
+    for (i = 0; i < N; i++) {
+      for (j = 0; j < N; j++) {
+        m[i+j*N] = a[i][j];
+      }
+      vf[i] = b[i][0]; 
     }
-    vf[i] = b[i][0]; 
   }
 
@@ -66 +69 @@
 
   if (!status && !QUIET) {
-      gprint (GP_ERR, "failure in matrix solution\n");
+      gprint (GP_ERR, "gaussjordan: ill-conditioned matrix; input values are retained\n");
   }
   return (status);

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/cmd.data/init.c

@@ -193 +193 @@
   {1, "iminterp",     minterp,          "interpolate image pixels"},
   {1, "mkrgb",        mkrgb,            "convert 3 images to rgb jpeg (use Kapa for better control)"},
+  {1, "mset",         mset,             "insert a vector in an image"},
   {1, "imset",        mset,             "insert a vector in an image"},
   {1, "parity",       parity,           "set image parity"},

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/dvo/avextract.c

@@ -205 +205 @@
     gprint (GP_ERR, "  <photcode>:cal : first calibrated magnitude for <photcode> \n");
     gprint (GP_ERR, "  <photcode>:err : magnitude error for photcode\n");
-    gprint (GP_ERR, "  <photcode>:chipsq : chi-square of magnitude fit\n");
+    gprint (GP_ERR, "  <photcode>:chisq : raw chi-square of magnitude fit\n");
     gprint (GP_ERR, "  type : dophot type (unused)\n");
     gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/dvo/gstar.c

@@ -14 +14 @@
   int Nstars, found, GetMeasures, Nlo, Nhi;
   int SaveVectors;
-  Vector *vec1, *vec2, *vec3, *vec4;
+  Vector *vec1, *vec2, *vec3, *vec4, *vec5, *vec6;
   SkyTable *sky;
   SkyList *skylist;
@@ -37 +37 @@
 
   NPTS = 0;
-  vec1 = vec2 = vec3 = vec4 = NULL;
+  vec1 = vec2 = vec3 = vec4 = vec5 = vec6 = NULL;
   SaveVectors = FALSE;
   if ((N = get_argument (argc, argv, "-save"))) {
@@ -46 +46 @@
     if ((vec3 = SelectVector ("gs:z", ANYVECTOR, TRUE)) == NULL) return (FALSE);
     if ((vec4 = SelectVector ("gs:f", ANYVECTOR, TRUE)) == NULL) return (FALSE);
+    if ((vec5 = SelectVector ("gs:dr", ANYVECTOR, TRUE)) == NULL) return (FALSE);
+    if ((vec6 = SelectVector ("gs:dd", ANYVECTOR, TRUE)) == NULL) return (FALSE);
   }
 
@@ -87 +89 @@
   /* lock, load, unlock catalog */
   catalog.filename = skylist[0].filename[0];
-  catalog.catflags = LOAD_AVES | LOAD_MEAS | LOAD_SECF;
+  catalog.catflags = GetMeasures ? LOAD_AVES | LOAD_MEAS | LOAD_SECF : LOAD_AVES | LOAD_SECF;
   catalog.Nsecfilt = 0;
 
@@ -140 +142 @@
     ResetVector (vec3, OPIHI_FLT, NPTS);
     ResetVector (vec4, OPIHI_FLT, NPTS);
+    ResetVector (vec5, OPIHI_FLT, NPTS);
+    ResetVector (vec6, OPIHI_FLT, NPTS);
   }
 
@@ -156 +160 @@
         gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
         gprint (GP_LOG, "%11.7f ", catalog.average[k].D);
+        gprint (GP_LOG, "%5.2f ",   3600.0*sqrt(r));
         gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
         gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
-        gprint (GP_LOG, "%5d",     catalog.average[k].flags);
-
+        gprint (GP_LOG, "%5d ",     catalog.average[k].flags);
+        
         if (FULL_OUTPUT) {
-            gprint (GP_LOG, "%f",     catalog.average[k].dR);
-            gprint (GP_LOG, "%f",     catalog.average[k].dD);
-            gprint (GP_LOG, "%f",     catalog.average[k].uR);
-            gprint (GP_LOG, "%f",     catalog.average[k].uD);
-            gprint (GP_LOG, "%f",     catalog.average[k].duR);
-            gprint (GP_LOG, "%f",     catalog.average[k].duD);
-            gprint (GP_LOG, "%f",     catalog.average[k].P);
-            gprint (GP_LOG, "%f",     catalog.average[k].dP);
-            gprint (GP_LOG, "%x",     catalog.average[k].objID);
-            gprint (GP_LOG, "%x",     catalog.average[k].catID);
+            gprint (GP_LOG, "%f ",     catalog.average[k].dR);
+            gprint (GP_LOG, "%f ",     catalog.average[k].dD);
+            gprint (GP_LOG, "%f ",     catalog.average[k].uR);
+            gprint (GP_LOG, "%f ",     catalog.average[k].uD);
+            gprint (GP_LOG, "%f ",     catalog.average[k].duR);
+            gprint (GP_LOG, "%f ",     catalog.average[k].duD);
+            gprint (GP_LOG, "%f ",     catalog.average[k].P);
+            gprint (GP_LOG, "%f ",     catalog.average[k].dP);
+            gprint (GP_LOG, "%x ",     catalog.average[k].objID);
+            gprint (GP_LOG, "%x ",     catalog.average[k].catID);
         }
 
@@ -210 +215 @@
             gprint (GP_LOG, "%20s  ",  date);
             gprint (GP_LOG, "%7.4f ",  catalog.measure[m].dR);
-            gprint (GP_LOG, "%7.4f",   catalog.measure[m].dD);
+            gprint (GP_LOG, "%7.4f ",  catalog.measure[m].dD);
             gprint (GP_LOG, "%4x ",    catalog.measure[m].photFlags);
             gprint (GP_LOG, "%3x ",    catalog.measure[m].dbFlags);
             gprint (GP_LOG, "%5d ",    catalog.measure[m].photcode);
-            gprint (GP_LOG, "%-20s  ", GetPhotcodeNamebyCode (catalog.measure[m].photcode));
-            gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWx);
+            gprint (GP_LOG, "%-20s ",  GetPhotcodeNamebyCode (catalog.measure[m].photcode));
+            gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWx);
             gprint (GP_LOG, "%5.2f ",  0.01*catalog.measure[m].FWy);
 
             if (FULL_OUTPUT) {
-                gprint (GP_LOG, "%f", catalog.measure[m].Mcal);
-                gprint (GP_LOG, "%f", catalog.measure[m].Map);
-                gprint (GP_LOG, "%f", pow(10.0, 0.4*catalog.measure[m].dt));
-                gprint (GP_LOG, "%f", 1.0 + catalog.measure[m].airmass);
-                gprint (GP_LOG, "%f", catalog.measure[m].az);
-                gprint (GP_LOG, "%f", catalog.measure[m].Xccd);
-                gprint (GP_LOG, "%f", catalog.measure[m].Yccd);
-                gprint (GP_LOG, "%d", catalog.measure[m].dXccd);
-                gprint (GP_LOG, "%d", catalog.measure[m].dYccd);
-                gprint (GP_LOG, "%f", catalog.measure[m].Sky);
-                gprint (GP_LOG, "%f", catalog.measure[m].dSky);
-                gprint (GP_LOG, "%d", catalog.measure[m].averef);
-                gprint (GP_LOG, "%d", catalog.measure[m].detID);
-                gprint (GP_LOG, "%d", catalog.measure[m].imageID);
-                gprint (GP_LOG, "%f", catalog.measure[m].psfQual);
-                gprint (GP_LOG, "%f", catalog.measure[m].psfChisq);
-                gprint (GP_LOG, "%f", catalog.measure[m].crNsigma);
-                gprint (GP_LOG, "%f", catalog.measure[m].extNsigma);
-                gprint (GP_LOG, "%f", 0.01*catalog.measure[m].FWx);
-                gprint (GP_LOG, "%f", 0.01*catalog.measure[m].FWy);
-                gprint (GP_LOG, "%f", (360.0/(float)0xffff)*catalog.measure[m].theta);
+                gprint (GP_LOG, "%f ", catalog.measure[m].Mcal);
+                gprint (GP_LOG, "%f ", catalog.measure[m].Map);
+                gprint (GP_LOG, "%f ", pow(10.0, 0.4*catalog.measure[m].dt));
+                gprint (GP_LOG, "%f ", 1.0 + catalog.measure[m].airmass);
+                gprint (GP_LOG, "%f ", catalog.measure[m].az);
+                gprint (GP_LOG, "%f ", catalog.measure[m].Xccd);
+                gprint (GP_LOG, "%f ", catalog.measure[m].Yccd);
+                gprint (GP_LOG, "%d ", catalog.measure[m].dXccd);
+                gprint (GP_LOG, "%d ", catalog.measure[m].dYccd);
+                gprint (GP_LOG, "%f ", catalog.measure[m].Sky);
+                gprint (GP_LOG, "%f ", catalog.measure[m].dSky);
+                gprint (GP_LOG, "%d ", catalog.measure[m].averef);
+                gprint (GP_LOG, "%d ", catalog.measure[m].detID);
+                gprint (GP_LOG, "%d ", catalog.measure[m].imageID);
+                gprint (GP_LOG, "%f ", catalog.measure[m].psfQual);
+                gprint (GP_LOG, "%f ", catalog.measure[m].psfChisq);
+                gprint (GP_LOG, "%f ", catalog.measure[m].crNsigma);
+                gprint (GP_LOG, "%f ", catalog.measure[m].extNsigma);
+                gprint (GP_LOG, "%f ", 0.01*catalog.measure[m].FWx);
+                gprint (GP_LOG, "%f ", 0.01*catalog.measure[m].FWy);
+                gprint (GP_LOG, "%f ", (360.0/(float)0xffff)*catalog.measure[m].theta);
             }
             gprint (GP_LOG, "\n");
@@ -251 +256 @@
             vec3[0].elements.Flt[N] = catalog.measure[m].airmass;
             vec4[0].elements.Flt[N] = catalog.measure[m].photcode;
+            vec5[0].elements.Flt[N] = catalog.measure[m].dR;
+            vec6[0].elements.Flt[N] = catalog.measure[m].dD;
             N ++;
             if (N == NPTS - 1) {
@@ -258 +265 @@
               REALLOCATE (vec3[0].elements.Flt, opihi_flt, NPTS);
               REALLOCATE (vec4[0].elements.Flt, opihi_flt, NPTS);
+              REALLOCATE (vec5[0].elements.Flt, opihi_flt, NPTS);
+              REALLOCATE (vec6[0].elements.Flt, opihi_flt, NPTS);
             }
           }
@@ -270 +279 @@
     vec3[0].Nelements = N;
     vec4[0].Nelements = N;
+    vec5[0].Nelements = N;
+    vec6[0].Nelements = N;
   }
 

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/dvo/mextract.c

@@ -226 +226 @@
     gprint (GP_ERR, "  <photcode>:cal :  calibrated magnitude for photcode \n");
     gprint (GP_ERR, "  <photcode>:err : magnitude error for photcode\n");
-    gprint (GP_ERR, "  <photcode>:chisq : chi-square of magnitude fit\n");
+    gprint (GP_ERR, "  <photcode>:chisq : raw chi-square of magnitude fit\n");
     gprint (GP_ERR, "  <photcode>:ncode : number of measurements in photcode\n");
     gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude\n");

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/dvo/mmextract.c

@@ -348 +348 @@
     gprint (GP_ERR, "  photcode:cal :  calibrated magnitude for photcode \n");
     gprint (GP_ERR, "  photcode:err : magnitude error for photcode\n");
-    gprint (GP_ERR, "  photcode:chisq : chi-square of magnitude fit\n");
+    gprint (GP_ERR, "  photcode:chisq : raw chi-square of magnitude fit\n");
     gprint (GP_ERR, "  photcode:ncode : number of measurements in photcode\n");
     gprint (GP_ERR, "  photcode:nphot : number of measurements used for average magnitude\n");

branches/cnb_branches/cnb_branch_20090301/Ohana/src/opihi/lib.shell/gprint.c

@@ -306 +306 @@
     status = vfprintf (stream[0].file, format, argp);
     if (status < 0) {
-      abort();
+      return (FALSE);
     }
   } else {

branches/cnb_branches/cnb_branch_20090301/Ohana/src/tools/src/fields.c

@@ -60 +60 @@
   while (fscanf (stdin, "%s", filename) != EOF) {
     if (!Extnum && !Extname) {
-      GotFile &= gfits_read_header (filename, &header);
+      if (!gfits_read_header (filename, &header)) continue;
+      GotFile = TRUE;
       GotField &= print_fields (filename, NULL, &header, argc, argv);
       continue;
     }
     if (Extnum) {
-      GotFile  &= gfits_read_Xheader (filename, &header, Nextend);
+      if (!gfits_read_Xheader (filename, &header, Nextend)) continue;
+      GotFile = TRUE;
       GotField &= print_fields (filename, NULL, &header, argc, argv);
       continue;
@@ -98 +100 @@
         Nextend ++;
 
-        GotFile = gfits_read_Xheader (filename, &header, Nextend);
+        GotFile &= gfits_read_Xheader (filename, &header, Nextend);
         continue;
       }