Changeset 21508 for trunk/Ohana/src/opihi

Timestamp:

Feb 16, 2009, 11:33:52 AM (17 years ago)

Author:

eugene

Message:

merge changes from eam_branch_20090208: add PS1_V1 formats; rename average.code to flags, image.code to flags; some opihi function name clarification; drop Stars as autocode struct; rework addstar to isolate input -> Measure conversions

Location:

trunk/Ohana/src/opihi

Files:

• cmd.data/Makefile (modified) (5 diffs)
• cmd.data/applyfit.c (deleted)
• cmd.data/applyfit1d.c (added)
• cmd.data/clip.c (deleted)
• cmd.data/fit.c (deleted)
• cmd.data/fit1d.c (added)
• cmd.data/imclip.c (added)
• cmd.data/imstats.c (added)
• cmd.data/init.c (modified) (8 diffs)
• cmd.data/stats.c (deleted)
• cmd.data/vstat.c (deleted)
• cmd.data/vstats.c (added)
• dvo/dbExtractAverages.c (modified) (1 diff)
• dvo/dbExtractImages.c (modified) (1 diff)
• dvo/dbExtractMeasures.c (modified) (5 diffs)
• dvo/dbFields.c (modified) (2 diffs)
• dvo/gimages.c (modified) (1 diff)
• dvo/gstar.c (modified) (4 diffs)
• dvo/paverage.c (modified) (1 diff)
• dvo/photometry.c (modified) (14 diffs)
• dvo/pmeasure.c (modified) (1 diff)
• include/dvoshell.h (modified) (1 diff)

trunk/Ohana/src/opihi/cmd.data/Makefile

@@ -20 +20 @@
 $(SRC)/accum.$(ARCH).o          \
 $(SRC)/applyfit2d.$(ARCH).o     \
-$(SRC)/applyfit.$(ARCH).o       \
+$(SRC)/applyfit1d.$(ARCH).o     \
 $(SRC)/box.$(ARCH).o            \
 $(SRC)/book.$(ARCH).o           \
@@ -26 +26 @@
 $(SRC)/center.$(ARCH).o \
 $(SRC)/clear.$(ARCH).o          \
-$(SRC)/clip.$(ARCH).o           \
+$(SRC)/imclip.$(ARCH).o         \
 $(SRC)/close.$(ARCH).o          \
 $(SRC)/concat.$(ARCH).o \
@@ -44 +44 @@
 $(SRC)/fft1d.$(ARCH).o          \
 $(SRC)/fft2d.$(ARCH).o          \
+$(SRC)/fit1d.$(ARCH).o          \
 $(SRC)/fit2d.$(ARCH).o          \
-$(SRC)/fit.$(ARCH).o            \
 $(SRC)/gaussj.$(ARCH).o \
 $(SRC)/gaussdeviate.$(ARCH).o   \
@@ -107 +107 @@
 $(SRC)/spline_apply.$(ARCH).o   \
 $(SRC)/spline_construct.$(ARCH).o \
-$(SRC)/stats.$(ARCH).o             \
+$(SRC)/imstats.$(ARCH).o           \
 $(SRC)/style.$(ARCH).o             \
 $(SRC)/subraster.$(ARCH).o         \
@@ -131 +131 @@
 $(SRC)/vroll.$(ARCH).o             \
 $(SRC)/vsmooth.$(ARCH).o        \
-$(SRC)/vstat.$(ARCH).o             \
+$(SRC)/vstats.$(ARCH).o            \
 $(SRC)/wd.$(ARCH).o                \
 $(SRC)/write_vectors.$(ARCH).o     \

trunk/Ohana/src/opihi/cmd.data/init.c

@@ -3 +3 @@
 int accum            PROTO((int, char **));
 int applyfit         PROTO((int, char **));
+int applyfit1d       PROTO((int, char **));
 int applyfit2d       PROTO((int, char **));
 int box              PROTO((int, char **));
@@ -11 +12 @@
 int clear            PROTO((int, char **));
 int clip             PROTO((int, char **));
+int imclip           PROTO((int, char **));
 int close_device     PROTO((int, char **));
 int concat           PROTO((int, char **));
@@ -29 +31 @@
 int fft1d            PROTO((int, char **));
 int fft2d            PROTO((int, char **));
+int fit              PROTO((int, char **));
+int fit1d            PROTO((int, char **));
 int fit2d            PROTO((int, char **));
-int fit              PROTO((int, char **));
 int gaussjordan      PROTO((int, char **));
 int gaussdeviate     PROTO((int, char **));
@@ -92 +95 @@
 int spline_construct_cmd PROTO((int, char **));
 int stats            PROTO((int, char **));
+int imstats          PROTO((int, char **));
 int style            PROTO((int, char **));
 int subraster        PROTO((int, char **));
@@ -113 +117 @@
 int vload            PROTO((int, char **));
 int vzload           PROTO((int, char **));
-int vstat            PROTO((int, char **));
+int vstats           PROTO((int, char **));
 int vroll            PROTO((int, char **));
 int vpop             PROTO((int, char **));
@@ -124 +128 @@
 static Command cmds[] = {  
   {1, "accum",        accum,            "accumulate vector values in another vector"},
-  {1, "applyfit",     applyfit,         "apply fit to new vector"},
+  {1, "applyfit",     applyfit1d,       "apply 1-d fit to new vector"},
+  {1, "applyfit1d",   applyfit1d,       "apply 1-d fit to new vector"},
   {1, "applyfit2d",   applyfit2d,       "apply 2-d fit to new vector"},
+  {1, "book",         book_command,     "commands to manipulate book/page/word data"},
   {1, "box",          box,              "draw a box on the plot"},
-  {1, "book",         book_command,     "commands to manipulate book/page/word data"},
+  {1, "buffers",      list_buffers,     "list the currently allocated buffers (images)"},
+  {1, "images",       list_buffers,     "list the currently allocated images"},
   {1, "center",       center,           "center image on coords"},
-  {1, "parity",       parity,           "set image parity"},
   {1, "circstats",    circstats,        "circular statistics"},
   {1, "clear",        clear,            "erase plot"},
-  {1, "clip",         clip,             "clip values in a buffer to be within a range"},
+  {1, "clip",         imclip,           "clip values in an image to be within a range"},
   {1, "close",        close_device,     "close the current display device"},
-  {1, "concat",       concat,           "reduce vector dimension"},
+  {1, "concat",       concat,           "append values to the end of a vector"},
   {1, "contour",      contour,          "create contour from image"},
   {1, "create",       create,           "create a new vector"},
+  {1, "vcreate",      create,           "create a new vector"},
   {1, "cumulative",   cumulative,       "build a cumulative histogram from a specific histogram"},
   {1, "cursor",       cursor,           "get coords from cursor"},
@@ -143 +150 @@
   {1, "dbconnect",    dbconnect,        "setup mysql db connection"},
   {1, "dbselect",     dbselect,         "extract vectors from mysql database table"},
-  {1, "delete",       delete,           "delete vectors or matrices"},
+  {1, "delete",       delete,           "delete vectors or images"},
   {1, "device",       device,           "set / get current graphics device"},
-  {1, "dimendown",    dimendown,        "convert matrix to vector"},
-  {1, "dimenup",      dimenup,          "convert vector to matrix"},
-  {1, "erase",        erase,            "erase objects on an overlay"},
-  {1, "extract",      extract,          "extract a portion of a buffer into another buffer"},
-  {1, "fft1d",        fft1d,            "fft on the pixel-stream in an image"},
+  {1, "dimendown",    dimendown,        "convert image to vector"},
+  {1, "dimenup",      dimenup,          "convert vector to image"},
+  {1, "dot",          dot,              "plot a single point"},
+  {1, "erase",        erase,            "erase objects on an image overlay"},
+  {1, "extract",      extract,          "extract a portion of a image into another image"},
+  {1, "fft1d",        fft1d,            "fft on a vector"},
   {1, "fft2d",        fft2d,            "fft on an image"},
-  {1, "fit",          fit,              "fit polynomial to vector pair"},
+  {1, "fit",          fit1d,            "fit polynomial to vector pair"},
+  {1, "fit1d",        fit1d,            "fit polynomial to vector pair"},
   {1, "fit2d",        fit2d,            "fit 2-d polynomial to vector triplet"},
-  {1, "gaussj",       gaussjordan,      "solve Ax = B (N-D)"},
   {1, "gaussdev",     gaussdeviate,     "generate a gaussian deviate vector"},
   {1, "gaussint",     gaussintegral,    "return the integrated gaussian vector"},
-  {1, "grid",         grid,             "plot cartesian grid"},
-  {1, "gridify",      gridify,          "convert vector triplet to buffer"},
+  {1, "gaussj",       gaussjordan,      "solve Ax = B (N-Dimensional)"},
+  {1, "grid",         grid,             "plot cartesian grid on graph"},
+  {1, "gridify",      gridify,          "convert vector triplet to image (same as vgrid?)"},
   {1, "grow",         grow,             "grow a mask"},
-  {1, "ungridify",    ungridify,        "convert buffer region to vector triplet"},
-  {1, "header",       header,           "print buffer header"},
+  {1, "header",       header,           "print image header"},
   {1, "histogram",    histogram,        "generate histogram from vector"},
+  {1, "imbin",        rebin,            "rebin image data by factor of N"},
+  {1, "imclip",       imclip,           "clip values in an image to be within a range"},
   {1, "imcut",        imcut,            "linear image cut between arbitrary coords"},
-  {1, "imhist",       imhist,           "histogram of an image region"},
+  {1, "imhistogram",  imhist,           "histogram of an image region"},
   {1, "imsmooth",     imsmooth,         "circular gaussian smoothing"},
+  {1, "imstats",      imstats,          "statistics on a portion of an image"},
   {1, "integrate",    integrate,        "integrate a vector"},
   {1, "interpolate",  interpolate,      "interpolate between vector pairs"},
-  {1, "jpeg",         jpeg,             "write text line on graph"},
-  {1, "png",          jpeg,             "write text line on graph"},
-  {1, "ppm",          jpeg,             "write text line on graph"},
+  {1, "jpeg",         jpeg,             "convert display image to JPEG"},
   {1, "kern",         kern,             "convolve with 3x3 kernel"},
-  {1, "keyword",      keyword,          "extract a FITS keyword from buffer header"},
+  {1, "keyword",      keyword,          "extract a FITS keyword from image header"},
   {1, "labels",       labels,           "define labels for plot"},
   {1, "limits",       limits,           "define plot limits"},
-  {1, "line",         line,             "plot line"},
-  {1, "buffers",      list_buffers,     "list the currently allocated buffers"},
-  {1, "vectors",      list_vectors,     "list vectors"},
-  {1, "load",         load,             "load an SAOimage style overlay"},
+  {1, "line",         line,             "plot a line"},
+  {1, "load",         load,             "load an SAOimage/DS9 style overlay"},
   {1, "lookup",       lookup,           "convert vector via lookup table (vector pair)"},
-  {1, "mkrgb",        mkrgb,            "convert 3 images to rgb jpeg"},
-  {1, "mcreate",      mcreate,          "create a matrix"},
+  {1, "mcreate",      mcreate,          "create an image"},
+  {1, "imcreate",     mcreate,          "create an image"},
   {1, "medacc",       medacc,           "accumulate vector values in another vector"},
-  {1, "mget",         mget,             "extract a vector from a matrix"},
+  {1, "mget",         mget,             "extract a vector from an image"},
+  {1, "imget",        mget,             "extract a vector from an image"},
   {1, "minterp",      minterp,          "interpolate image pixels"},
-  {1, "mset",         mset,             "insert a vector in a matrix"},
+  {1, "iminterp",     minterp,          "interpolate image pixels"},
+  {1, "mkrgb",        mkrgb,            "convert 3 images to rgb jpeg (use Kapa for better control)"},
+  {1, "imset",        mset,             "insert a vector in an image"},
+  {1, "parity",       parity,           "set image parity"},
   {1, "peak",         peak,             "find vector peak in range"},
   {1, "periodogram",  periodogram,      "measure periods in unevenly sampled data"},
   {1, "plot",         plot,             "plot a pair of vectors"},
-  {1, "dot",          dot,              "plot a single point"},
-  {1, "point",        point,            "load overlay with single point"},
-  {1, "ps",           ps,               "define labels for plot"},
+  {1, "png",          jpeg,             "convert display graphic to PNG"},
+  {1, "point",        point,            "load image overlay with a single point"},
+  {1, "ppm",          jpeg,             "convert display graphic to PPM"},
+  {1, "ps",           ps,               "convert display to PostScript"},
+  {1, "queuedelete",  queuedelete,      "delete a queue"},
+  {1, "queuedrop",    queuedrop,        "drop values from queue matching a key"},
+  {1, "queueinit",    queueinit,        "create an empty queue"},
+  {1, "queuelist",    queuelist,        "list defined queues"},
+  {1, "queueload",    queueload,        "load queue from command"},
   {1, "queuepop",     queuepop,         "pop value from queue to variable"},
-  {1, "queuedrop",    queuedrop,        "drop values from queue matching a key"},
   {1, "queueprint",   queueprint,       "print the contents of a queue"},
   {1, "queuepush",    queuepush,        "push value onto queue"},
-  {1, "queueinit",    queueinit,        "create an empty queue"},
-  {1, "queuedelete",  queuedelete,      "delete a queue"},
-  {1, "queuelist",    queuelist,        "list defined queues"},
-  {1, "queueload",    queueload,        "load queue from command"},
+  {1, "queuesize",    queuesize,        "show queue size"},
   {1, "queuesubstr",  queuesubstr,      "bulk replace strings in queue"},
-  {1, "queuesize",    queuesize,        "show queue size"},
   {1, "rd",           rd,               "load fits image"},
   {1, "rdseg",        rdseg,            "read a segment of an image from a file"},
   {1, "read",         read_vectors,     "read vectors from datafile"},
-  {1, "rebin",        rebin,            "rebin data by factor of N"},
+  {1, "rebin",        rebin,            "rebin image data by factor of N"},
   {1, "resize",       resize,           "set graphics/image window size"},
   {1, "roll",         roll,             "roll image to new start point"},
   {1, "rotate",       rotate,           "rotate image"},
-  {1, "save",         save,             "save an SAOimage style overlay"},
+  {1, "save",         save,             "save an SAOimage style image overlay"},
   {1, "section",      section,          "define section of graph"},
-  {1, "set",          set,              "vector math"},
+  {1, "select",       vect_select,      "selective vector assignment"},
+  {1, "set",          set,              "image and vector math"},
   {1, "shift",        shift,            "shift data in an image"},
   {1, "sort",         sort_vectors,     "sort list of vectors"},
   {1, "spline.apply", spline_apply_cmd, "apply spline fit to generate an image"},
   {1, "spline.const", spline_construct_cmd, "create spline 2nd deriv. terms"},
-  {1, "stats",        stats,            "give statistics on a portion of a buffer"},
+  {1, "stats",        imstats,          "statistics on a portion of an image"},
   {1, "style",        style,            "set the style for graph plots"},
   {1, "subraster",    subraster,        "subraster of fits image"},
-  {1, "subset",       subset,           "expand vector dimension"},
-  {1, "svd",          svd,              "singular value decomposition of a matrix"},
+  {1, "subset",       subset,           "generate a vector from a portion of another vector"},
+  {1, "svd",          svd,              "singular value decomposition of a matrix (image)"},
   {1, "swapbytes",    swapbytes,        "byte swap thing"},
   {1, "textline",     textline,         "write text line on graph"},
@@ -225 +238 @@
   {1, "tvchannel",    tvchannel,        "set the current tv channel"},
   {1, "tvcolors",     tvcolors,         "set the tv colormap"},
-  {1, "tvcontour",    tvcontour,        "send contour to overlay"},
-  {1, "tvgrid",       tvgrid,           "wait until return is typed"},
+  {1, "tvcontour",    tvcontour,        "send contour to image overlay"},
+  {1, "tvgrid",       tvgrid,           "RA/DEC grid on an image"},
+  {1, "ungridify",    ungridify,        "convert image region to vector triplet"},
   {1, "uniq",         uniq,             "create a uniq vector subset from a vector"},
   {1, "unsign",       unsign,           "toggle the UNSIGN status"},
-  {1, "vbin",         vbin,             "bin values in a vector to be within a range"},
+  {1, "vbin",         vbin,             "rebin vector data by a fector of N"},
   {1, "vclip",        vclip,            "clip values in a vector to be within a range"},
-  {1, "select",       vect_select,      "selective vector assignment"},
-  {1, "vgauss",       vgauss,           ""},
-  {1, "vmaxwell",     vmaxwell,         ""},
-  {1, "vgrid",        vgrid,            ""},
-  {1, "vload",        vload,            "load vectors on Kii"},
-  {1, "vzload",       vzload,           "load vectors on Kii"},
-  {1, "vstat",        vstat,            "get info from imreg database"},
-  {1, "vsmooth",      vsmooth,          "gaussian smooth of a vector"},
+  {1, "vectors",      list_vectors,     "list vectors"},
+  {1, "vgauss",       vgauss,           "fit a Gaussian to a vector"},
+  {1, "vgrid",        vgrid,            "generate an image from a triplet of vectors"},
+  {1, "vhistogram",   histogram,        "generate histogram from vector"},
+  {1, "vload",        vload,            "load vectors as overlay on image display"},
+  {1, "vmaxwell",     vmaxwell,         "fit a Maxwellian to a vector"},
+  {1, "vpop",         vpop,             "remove first element of a vector"},
   {1, "vroll",        vroll,            "roll vector elements"},
-  {1, "vpop",         vpop,             "remove first element"},
+  {1, "vsmooth",      vsmooth,          "Gaussian smooth of a vector"},
+  {1, "vstats",       vstats,           "statistics on a vector"},
+  {1, "vzload",       vzload,           "load vectors as overlay on image display (scaled points)"},
   {1, "wd",           wd,               "write an image to a file"},
   {1, "write",        write_vectors,    "write vectors to datafile"},
-  {1, "zap",          zap,              "delete pixels"},
+  {1, "zap",          zap,              "assign values to pixel regions"},
   {1, "zplot",        zplot,            "plot x y with size scaled by z"},
 }; 

trunk/Ohana/src/opihi/dvo/dbExtractAverages.c

@@ -121 +121 @@
       break;
     case AVE_FLAG:
-      value.Int = average[0].code;
+      value.Int = average[0].flags;
       break;
     case AVE_OBJID:

trunk/Ohana/src/opihi/dvo/dbExtractImages.c

@@ -247 +247 @@
       break;
     case IMAGE_FLAG:
-      value.Int = image[N].code;
+      value.Int = image[N].flags;
       break;
     case IMAGE_CCDNUM:

trunk/Ohana/src/opihi/dvo/dbExtractMeasures.c

@@ -146 +146 @@
         case MAG_NPHOT:
           if (equiv == NULL) {
-            value.Int = NAN;
+            value.Int = 0;
             break;
           }
@@ -260 +260 @@
       break;
     case MEAS_OBJFLAGS: /* OK */
-      value.Int = average[0].code;
+      value.Int = average[0].flags;
       break;
     // note that these represent the ra displacement relative to the average, not 
@@ -312 +312 @@
       break;
     case MEAS_DOPHOT: /* OK */
-      value.Flt = measure[0].dophot;
+      value.Int = (measure[0].photFlags >> 16);
       break;
     case MEAS_DB_FLAGS: /* ? */
@@ -394 +394 @@
       break;
     case MEAS_PSF_QF: /* OK */
-      value.Flt = measure[0].qPSF;
+      value.Flt = measure[0].psfQual;
       break;
     case MEAS_PSF_CHISQ: /* OK */
@@ -404 +404 @@
     case MEAS_EXT_NSIGMA: /* OK */
       value.Flt = measure[0].extNsigma;
-      break;
-    case MEAS_STARGAL: /* OK */
-      value.Flt = measure[0].stargal;
       break;
 

trunk/Ohana/src/opihi/dvo/dbFields.c

@@ -170 +170 @@
   if (!strcasecmp (fieldName, "FWHM_MIN"))   ESCAPE (MEAS_FWHM_MIN,       MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "THETA"))      ESCAPE (MEAS_THETA,          MAG_NONE, OPIHI_FLT);
-  if (!strcasecmp (fieldName, "DOPHOT"))     ESCAPE (MEAS_DOPHOT,         MAG_NONE, OPIHI_FLT);
+  if (!strcasecmp (fieldName, "DOPHOT"))     ESCAPE (MEAS_DOPHOT,         MAG_NONE, OPIHI_INT);
   if (!strcasecmp (fieldName, "DB_FLAGS"))   ESCAPE (MEAS_DB_FLAGS,       MAG_NONE, OPIHI_INT);
   if (!strcasecmp (fieldName, "PHOT_FLAGS")) ESCAPE (MEAS_PHOT_FLAGS,     MAG_NONE, OPIHI_INT);
@@ -193 +193 @@
   if (!strcasecmp (fieldName, "SKY"))        ESCAPE (MEAS_SKY,            MAG_NONE, OPIHI_FLT);
   if (!strcasecmp (fieldName, "SKY_ERR"))    ESCAPE (MEAS_dSKY,           MAG_NONE, OPIHI_FLT);
-  if (!strcasecmp (fieldName, "STARGAL"))    ESCAPE (MEAS_STARGAL,        MAG_NONE, OPIHI_FLT);
 
   // for words that don't parse, try a photcode

trunk/Ohana/src/opihi/dvo/gimages.c

@@ -220 +220 @@
     if (PixelCoords) {
       gprint (GP_LOG, "%3d %s %6.1f %6.1f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x\n", 
-               Nfound, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].code);
+               Nfound, image[i].name, X, Y, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags);
     } else {
       XY_to_RD (&ra, &dec, 0.5*image[i].NX, 0.5*image[i].NY, &image[i].coords);
       gprint (GP_LOG, "%3d %s %8.4f %8.4f %20s %5d %2d %4.2f %6.3f %5.3f %5.3f %4x\n", 
-               Nfound, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].code);
+               Nfound, image[i].name, ra, dec, date, image[i].nstar, image[i].photcode, image[i].secz, image[i].Mcal, image[i].dMcal, image[i].exptime, image[i].flags);
     }
     sprintf (name, "IMAGEx:%d", Nfound);

trunk/Ohana/src/opihi/dvo/gstar.c

@@ -158 +158 @@
         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].code);
+        gprint (GP_LOG, "%5d",     catalog.average[k].flags);
 
         if (FULL_OUTPUT) {
@@ -211 +211 @@
             gprint (GP_LOG, "%7.4f ",  catalog.measure[m].dR);
             gprint (GP_LOG, "%7.4f",   catalog.measure[m].dD);
-            gprint (GP_LOG, "%2d ",    catalog.measure[m].dophot);
+            gprint (GP_LOG, "%4x ",    catalog.measure[m].photFlags);
             gprint (GP_LOG, "%3x ",    catalog.measure[m].dbFlags);
             gprint (GP_LOG, "%5d ",    catalog.measure[m].photcode);
@@ -233 +233 @@
                 gprint (GP_LOG, "%d", catalog.measure[m].detID);
                 gprint (GP_LOG, "%d", catalog.measure[m].imageID);
-                gprint (GP_LOG, "%f", catalog.measure[m].qPSF);
+                gprint (GP_LOG, "%f", catalog.measure[m].psfQual);
                 gprint (GP_LOG, "%f", catalog.measure[m].psfChisq);
                 gprint (GP_LOG, "%f", catalog.measure[m].crNsigma);
@@ -240 +240 @@
                 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, "%x", catalog.measure[m].photFlags);
-                gprint (GP_LOG, "%d", catalog.measure[m].stargal);
             }
             gprint (GP_LOG, "\n");

trunk/Ohana/src/opihi/dvo/paverage.c

@@ -122 +122 @@
     /* project stars to screen display coords */
     for (i = 0; (i < catalog.Naverage) && !interrupt; i++) {
-      if (IDclip && (average[i].code != IDchoice)) continue;
+      if (IDclip && (average[i].flags != IDchoice)) continue;
       average[i].R = ohana_normalize_angle (average[i].R);
       while (average[i].R < Rmin) average[i].R += 360.0;

trunk/Ohana/src/opihi/dvo/photometry.c

@@ -2 +2 @@
 
 /* match code to measure  */
-# define TESTCODE(C,M) \
-  if (C != NULL) { \
-    switch (C[0].type) { \
-    case PHOT_DEP: \
-    case PHOT_REF: \
-      if (C[0].code != M.photcode) continue; \
-      break; \
-    case PHOT_SEC: \
-      if (C[0].code != GetPhotcodeEquivCodebyCode (M.photcode)) continue; \
-      break; \
-    default: \
-      break; \
-  } }
+# define TESTCODE(C,M)                                                  \
+  if (C != NULL) {                                                      \
+    switch (C[0].type) {                                                \
+      case PHOT_DEP:                                                    \
+      case PHOT_REF:                                                    \
+        if (C[0].code != M.photcode) continue;                          \
+        break;                                                          \
+      case PHOT_SEC:                                                    \
+        if (C[0].code != GetPhotcodeEquivCodebyCode (M.photcode)) continue; \
+        break;                                                          \
+      default:                                                          \
+        break;                                                          \
+    } }
 
 /* exclusions based on measure.params  */
-# define TESTMEASURE(M) \
-  if (ApplySelections[SelectionParam]) { \
-    if (TimeSelect && (M.t < tzero)) continue; \
-    if (TimeSelect && (M.t > tend)) continue; \
-    if (ErrSelect  && (M.dM > ErrValue)) continue; \
+# define TESTMEASURE(M)                                                 \
+  if (ApplySelections[SelectionParam]) {                                \
+    if (TimeSelect && (M.t < tzero)) continue;                          \
+    if (TimeSelect && (M.t > tend)) continue;                           \
+    if (ErrSelect  && (M.dM > ErrValue)) continue;                      \
+    if (iMagSelect && (PhotInst (&M) < iMagMin)) continue;              \
+    if (FlagSelect && (M.dbFlags != FlagValue)) continue;               \
     if (TypeSelect && (TypeValue != GetMeasureTypeCode (&M))) continue; \
-    if (iMagSelect && (PhotInst (&M) < iMagMin)) continue; \
-    if (FlagSelect && (M.dbFlags != FlagValue)) continue; \
-  }
-
-# define SETMAG(MOUT,MEAS,MODE) \
-  MOUT = NAN; \
-  if (MODE == MAG_INST) MOUT = PhotInst (&MEAS);  \
-  if (MODE == MAG_CAT)  MOUT = PhotCat  (&MEAS); \
-  if (MODE == MAG_SYS)  MOUT = PhotSys  (&MEAS, average, secfilt); \
-  if (MODE == MAG_REL)  MOUT = PhotRel  (&MEAS, average, secfilt); \
+  }
+
+# define SETMAG(MOUT,MEAS,MODE)                                         \
+  MOUT = NAN;                                                           \
+  if (MODE == MAG_INST) MOUT = PhotInst (&MEAS);                        \
+  if (MODE == MAG_CAT)  MOUT = PhotCat  (&MEAS);                        \
+  if (MODE == MAG_SYS)  MOUT = PhotSys  (&MEAS, average, secfilt);      \
+  if (MODE == MAG_REL)  MOUT = PhotRel  (&MEAS, average, secfilt);      \
   if (MODE == MAG_CAL)  MOUT = PhotCal  (&MEAS, average, secfilt, measure, GetPhotcodeEquivbyCode (MEAS.photcode)); \
   if (MODE == MAG_AVE)  MOUT = PhotAve  (GetPhotcodeEquivbyCode (MEAS.photcode), average, secfilt); \
   if (MODE == MAG_REF)  MOUT = PhotRef  (GetPhotcodeEquivbyCode (MEAS.photcode), average, secfilt, measure); \
-  if (ApplySelections[SelectionParam]) { \
-    if (MagSelect && (MOUT > MagMax)) continue; \
-    if (MagSelect && (MOUT < MagMin)) continue; \
+  if (ApplySelections[SelectionParam]) {                                \
+    if (MagSelect && (MOUT > MagMax)) continue;                         \
+    if (MagSelect && (MOUT < MagMin)) continue;                         \
   }
 
@@ -182 +182 @@
   if (!strcasecmp (parname, "dec"))      param = MEAS_DEC;
   if (!strcasecmp (parname, "mag"))      param = MEAS_MAG;
-  // if (!strcasecmp (parname, "dmag"))          param = MEAS_dMAG;
   if (!strcasecmp (parname, "airmass"))  param = MEAS_AIRMASS;
   if (!strcasecmp (parname, "exptime"))  param = MEAS_EXPTIME;
@@ -190 +189 @@
   if (!strcasecmp (parname, "dD"))       param = MEAS_DEC_OFFSET;
   if (!strcasecmp (parname, "fwhm"))     param = MEAS_FWHM;
-  // if (!strcasecmp (parname, "dophot"))        param = MEAS_DOPHOT;
   if (!strcasecmp (parname, "FLAGS"))    param = MEAS_DB_FLAGS;
   if (!strcasecmp (parname, "XCCD"))     param = MEAS_XCCD;
@@ -198 +196 @@
   if (!strcasecmp (parname, "help")) {
     gprint (GP_ERR, "value may be one of the following:\n");
-    gprint (GP_ERR, " ra dR dec dD mag dmag Mrel Mcal photcode time fwhm dophot xccd yccd xmosaic ymosaic flags\n");
+    gprint (GP_ERR, " ra dR dec dD mag dmag Mrel Mcal photcode time fwhm xccd yccd xmosaic ymosaic flags\n");
     gprint (GP_ERR, "value may also be a valid photcode\n");
     gprint (GP_ERR, "photcodes or 'mag' may have optional magnitude type: mag,[Minst, Mcat, Msys, Mrel, Mcal]\n");
@@ -311 +309 @@
 
   if (VarConfig ("ZERO_PT", "%lf", &ZERO_POINT) == (char *) NULL) {
-      gprint (GP_ERR, "ZERO_PT undefined in config\n");
-      return (FALSE);
+    gprint (GP_ERR, "ZERO_PT undefined in config\n");
+    return (FALSE);
   }
   SetZeroPoint (ZERO_POINT);
@@ -324 +322 @@
 
   if (VarConfig ("PHOTCODE_FILE", "%s", MasterPhotcodeFile) == (char *) NULL) {
-      gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
-      return (FALSE);
+    gprint (GP_ERR, "PHOTCODE_FILE undefined in config\n");
+    return (FALSE);
   }
   if (!LoadPhotcodes (CatdirPhotcodeFile, MasterPhotcodeFile)) {
@@ -642 +640 @@
       break;
     case AVE_FLAG:
-      value = average[0].code;
+      value = average[0].flags;
       break;
     case AVE_MAG:
@@ -659 +657 @@
           value = NAN;
           for (i = 0; i < average[0].Nmeasure; i++) {
-              if (code[0].code != measure[i].photcode) continue;
-              value = measure[i].M;
+            if (code[0].code != measure[i].photcode) continue;
+            value = measure[i].M;
           }
           break;
@@ -675 +673 @@
       break;
     case AVE_TYPEFRAC:
-      value = DetermineTypefrac (average, measure, code);
+      // value = DetermineTypefrac (average, measure, code);
+      value = NAN;
       break;
     case AVE_NCODE:
@@ -719 +718 @@
     if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[k].photcode))) continue;
     Nc ++;
-    if (measure[k].dophot != TypefracType) continue;
+    if ((measure[k].photFlags >> 16) != TypefracType) continue;
     Nt ++;
   }
@@ -744 +743 @@
 
 int GetMeasureTypeCode (Measure *measure) {
-  switch (measure[0].dophot) {
+  switch ((measure[0].photFlags >> 16)) {
     case 0:
     case 1:
@@ -770 +769 @@
   if (IsDophot) {
     
-    if (measure[0].dophot == 4) return (FALSE);
+    if ((measure[0].photFlags >> 16) == 4) return (FALSE);
     return (TRUE);
   
@@ -866 +865 @@
   if (ErrSelect) {
     dM = PhotdM (code, average, secfilt);
-    if (dM > ErrValue) return (NAN);
+    if (dM > ErrValue) return (FALSE);
   }
   
@@ -1137 +1136 @@
       value = average[0].D - measure[0].dD / 3600.0;
       break;
-# if (0)
-    case MEAS_dMAG: /* OK */
-      value = measure[0].dM;
-      break;
     case MEAS_DOPHOT: /* OK */
-      value = measure[0].dophot;
-      break;
-# endif
+      value = (measure[0].photFlags >> 16);
+      break;
     case MEAS_AIRMASS: /* OK */
       value = measure[0].airmass;

trunk/Ohana/src/opihi/dvo/pmeasure.c

@@ -192 +192 @@
     /* project stars to screen display coords */
     for (i = 0; (i < catalog.Naverage) && !interrupt; i++) {
-      if (IDclip && (catalog.average[i].code != IDchoice)) continue;
+      if (IDclip && (catalog.average[i].flags != IDchoice)) continue;
       catalog.average[i].R = ohana_normalize_angle (catalog.average[i].R);
       while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;

trunk/Ohana/src/opihi/include/dvoshell.h

@@ -106 +106 @@
       MEAS_CR_NSIGMA, 
       MEAS_EXT_NSIGMA, 
-      MEAS_STARGAL, 
 };