Changeset 27838 for branches/tap_branches/Ohana/src/opihi/dvo/mextract.c

Timestamp:

May 3, 2010, 8:41:49 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/tap_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/mextract.c (modified) (6 diffs)

branches/tap_branches/Ohana/src/opihi/dvo/mextract.c

@@ -3 +3 @@
 int mextract (int argc, char **argv) {
   
-  int i, j, k, m, n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
+  off_t i, j, k, m; // used for counter averages and measures
+  int n, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, VERBOSE, loadImages, mosaicMode;
   char **cstack, name[1024];
@@ -119 +120 @@
     catalog.Nsecfilt = Nsecfilt;
 
-    if (VERBOSE) gprint (GP_ERR, "trying %s (%d of %d)\n", catalog.filename, i, skylist[0].Nregions);
+    if (VERBOSE) gprint (GP_ERR, "trying %s (%lld of %lld)\n", catalog.filename, (long long) i, (long long) skylist[0].Nregions);
       
     // an error exit status here is a significant error
@@ -201 +202 @@
 
   if ((argc > N + 1) && !strcasecmp (argv[N+1], "fields")) {
-    gprint (GP_ERR, " USAGE: avextract field[,field,field...] where (expression)\n");
     gprint (GP_ERR, "  RA : right ascension (J2000) for detection [degrees]\n");
     gprint (GP_ERR, "  DEC : declination for detection [degrees]\n");
@@ -208 +208 @@
     gprint (GP_ERR, "  RA:err : ra scatter [degrees] \n");
     gprint (GP_ERR, "  DEC:err : dec scatter [degrees]\n");
+    gprint (GP_ERR, "  GLON : galactic longitude [degrees]\n");
+    gprint (GP_ERR, "  GLAT : galactic latitude [degrees]\n");
+    gprint (GP_ERR, "  GLON:ave : average galactic longitude [degrees]\n");
+    gprint (GP_ERR, "  GLAT:ave : average galactic latitude [degrees]\n");
+    gprint (GP_ERR, "  ELON : ecliptic longitude [degrees]\n");
+    gprint (GP_ERR, "  ELAT : ecliptic latitude [degrees]\n");
+    gprint (GP_ERR, "  ELON:ave : average ecliptic longitude [degrees]\n");
+    gprint (GP_ERR, "  ELAT:ave : average ecliptic latitude [degrees]\n");
     gprint (GP_ERR, "  uRA : proper motion in ra [mas/yr]\n");
     gprint (GP_ERR, "  uDEC : proper motion in dec [mas/yr]\n");
@@ -214 +222 @@
     gprint (GP_ERR, "  PAR : parallax\n");
     gprint (GP_ERR, "  dPAR : parallax error \n");
-    gprint (GP_ERR, "  nmeas : number of measurements\n");
-    gprint (GP_ERR, "  nmiss : number of non-detections\n");
-    gprint (GP_ERR, "  xp : positional raw chi-square\n");
-    gprint (GP_ERR, "  objflag : object flags\n");
+
+    gprint (GP_ERR, "  dR : ra offset [arcseconds]\n");
+    gprint (GP_ERR, "  dD : dec offset [arcseconds]\n");
+    gprint (GP_ERR, "  dR:fit : ra offset from fit [arcseconds]\n");
+    gprint (GP_ERR, "  dD:fit : dec offset from fit [arcseconds]\n");
+    gprint (GP_ERR, "  dR:err : ra offset error [arcseconds]\n");
+    gprint (GP_ERR, "  dD:err : dec offset error [arcseconds]\n");
+
+    gprint (GP_ERR, "  ChiSqPos : chi square of position fit \n");
+    gprint (GP_ERR, "  ChiSqPM  : chi square of proper-motion fit \n");
+    gprint (GP_ERR, "  ChiSqPar : chi square of parallax fit \n");
+
+    gprint (GP_ERR, "  Tmean : mean epoch (reference for proper motion)\n");
+    gprint (GP_ERR, "  Trange : range of times used for proper motion/parallax fit\n");
+
+
+    gprint (GP_ERR, "  Nmeas : number of measurements\n");
+    gprint (GP_ERR, "  Nmiss : number of non-detections\n");
+    gprint (GP_ERR, "  Npos  : number of measurments used for astrometry\n");
+
+    gprint (GP_ERR, "  objflags  : object flags\n");
+    gprint (GP_ERR, "  photflags : detection flags from image analysis\n");
+    gprint (GP_ERR, "  dbflags : detection flags from database analysis\n");
+
+    gprint (GP_ERR, "  obj_flags : object flags\n");
+    gprint (GP_ERR, "  phot_flags : detection flags from image analysis\n");
+    gprint (GP_ERR, "  db_flags : detection flags from database analysis\n");
+
     gprint (GP_ERR, "  <photcode>:ave : average magnitude for photcode (or equivalent)\n");
     gprint (GP_ERR, "  <photcode>:ref : reference magnitude system for photcode (or equivalent)\n");
@@ -225 +257 @@
     gprint (GP_ERR, "  <photcode>:rel :  relative magnitude for photcode\n");
     gprint (GP_ERR, "  <photcode>:cal :  calibrated magnitude for photcode \n");
-    gprint (GP_ERR, "  <photcode>:err : magnitude error for photcode\n");
+    gprint (GP_ERR, "  <photcode>:err :  magnitude error for measurement\n");
+    gprint (GP_ERR, "  <photcode>:ap :  catalog aperture magnitude for photcode\n");
+    gprint (GP_ERR, "  <photcode>:aper :  catalog aperture magnitude for photcode\n");
+    gprint (GP_ERR, "  <photcode>:aveerr : average error (stdev)\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");
     gprint (GP_ERR, "  airmass : airmass of detection\n");
+    gprint (GP_ERR, "  alt : altitude of detection\n");
+    gprint (GP_ERR, "  az  : azimuth of detection\n");
     gprint (GP_ERR, "  exptime : exposure time [s]\n");
     gprint (GP_ERR, "  photcode : photcode \n");
+    gprint (GP_ERR, "  photcode:equiv : equivalent average photcode \n");
     gprint (GP_ERR, "  time : time of exposure [Seconds since Jan 1, 1970/\n");
-    gprint (GP_ERR, "  dR : ra offset [arcseconds]\n");
-    gprint (GP_ERR, "  dD : dec offset [arcseconds]\n");
-    gprint (GP_ERR, "  fwhm : fwhm (average) [pixels]\n");
-    gprint (GP_ERR, "  fwhm_maj : fwhm (major axis) [pixels]\n");
-    gprint (GP_ERR, "  fwhm_min : fwhm (minor axis) [pixels]\n");
-    gprint (GP_ERR, "  theta : position angle\n");
-    gprint (GP_ERR, "  flags : detection flags\n");
+    gprint (GP_ERR, "  fwhm : fwhm (average) of fitted PSF [pixels]\n");
+    gprint (GP_ERR, "  fwhm_maj : fwhm (major axis) of fitted PSF [pixels]\n");
+    gprint (GP_ERR, "  fwhm_min : fwhm (minor axis) of fitted PSF [pixels]\n");
+    gprint (GP_ERR, "  theta : position angle of fitted PSF\n");
+    gprint (GP_ERR, "  posangle : position angle of detector at measurement [degrees]\n");
+    gprint (GP_ERR, "  platescale : plate scale of detector at measurement [arcsec/pixel] \n");
+
+    gprint (GP_ERR, "  psf_qf : PSF quality factor (psf-weighted mask fraction)\n");
+    gprint (GP_ERR, "  psf_chisq : PSF fit chi square\n");
+    gprint (GP_ERR, "  psf_ndof : PSF number of degrees of freedom\n");
+    gprint (GP_ERR, "  psf_npix : PSF number of pixels\n");
+
+    gprint (GP_ERR, "  cr_nsigma : Nsigma deviation towards cosmic ray\n");
+    gprint (GP_ERR, "  ext_nsigma : Nsigma deviation towards extended source\n");
+
+    gprint (GP_ERR, "  Mxx : second moment in X [pixels^2]\n");
+    gprint (GP_ERR, "  Mxy : second moment cross term [pixels^2]\n");
+    gprint (GP_ERR, "  Myy : second moment in Y [pixels^2]\n");
+
     gprint (GP_ERR, "  xccd : ccd x position\n");
     gprint (GP_ERR, "  yccd : ccd y position\n");
+    gprint (GP_ERR, "  xccd:err : ccd x position error\n");
+    gprint (GP_ERR, "  yccd:err : ccd y position error\n");
     gprint (GP_ERR, "  xmosaic : mosaic x position\n");
     gprint (GP_ERR, "  ymosaic : mosaic y position\n");
-    gprint (GP_ERR, "  xchip : chip x position\n");
-    gprint (GP_ERR, "  ychip : chip y position\n");
-    gprint (GP_ERR, "  xfpa : fpa x position\n");
-    gprint (GP_ERR, "  yfpa : fpa y position\n");
+    gprint (GP_ERR, "  xchip : chip x position (= ccd position)\n");
+    gprint (GP_ERR, "  ychip : chip y position (= ccd position)\n");
+    gprint (GP_ERR, "  xfpa : fpa x position (= mosaic position)\n");
+    gprint (GP_ERR, "  yfpa : fpa y position (= mosaic position)\n");
+
+    gprint (GP_ERR, "  detID : ID of detection (unique on source image)\n");
+    gprint (GP_ERR, "  objID : object ID (32 bit, unique in catalog)\n");
+    gprint (GP_ERR, "  catID : catalog ID (32 bit)\n");
+    gprint (GP_ERR, "  imageID : ID of source image (32 bit)\n");
     return (FALSE);
   }