Changeset 27840 for branches/simtest_nebulous_branches/Ohana/src/opihi/dvo/avextract.c

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• Ohana (modified) (1 prop)
• Ohana/src/opihi/dvo/avextract.c (modified) (7 diffs)

branches/simtest_nebulous_branches/Ohana/src/opihi/dvo/avextract.c

@@ -3 +3 @@
 int avextract (int argc, char **argv) {
   
-  int i, j, n, m, N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
+  off_t i, j, n, m;
+  int N, Npts, NPTS, last, next, state, Nfields, Nreturn, Ncstack, Nstack;
   int Nsecfilt, mode, VERBOSE;
   char **cstack, name[1024];
@@ -79 +80 @@
 
   /* create output storage vectors */
+  Npts = 0;
+  NPTS = 100;
   ALLOCATE (values, dbValue, Nfields);
   ALLOCATE (vec, Vector *, Nreturn);
@@ -90 +93 @@
     ResetVector (vec[i], fields[i].type, NPTS);
   }
-
-  Npts = 0;
-  NPTS = 1;
 
   // grab data from all selected sky regions
@@ -103 +103 @@
     catalog.Nsecfilt = 0;
 
-    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
@@ -182 +182 @@
 
   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) [degrees]\n");
     gprint (GP_ERR, "  DEC : declination [degrees]\n");
+    gprint (GP_ERR, "  GLON : galactic longitude [degrees]\n");
+    gprint (GP_ERR, "  GLAT : galactic latitude [degrees]\n");
+    gprint (GP_ERR, "  ELON : ecliptic longitude [degrees]\n");
+    gprint (GP_ERR, "  ELAT : ecliptic latitude [degrees]\n");
     gprint (GP_ERR, "  dRA : ra scatter [degrees]\n");
     gprint (GP_ERR, "  dDEC : dec scatter [degrees]\n");
@@ -193 +196 @@
     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, "  flag : object flags\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, "  Nastrom  : number of measurments used for astrometry (= Npos)\n");
+
+    gprint (GP_ERR, "  flags     : object flags\n");
+    gprint (GP_ERR, "  objflags  : object flags\n");
+    gprint (GP_ERR, "  obj_flags : object flags\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, "  extID_hi : external ID (upper 32 of 64 bit) -- eg, PSPS ID\n");
+    gprint (GP_ERR, "  extID_lo : external ID (lower 32 of 64 bit) -- eg, PSPS ID\n");
+
     gprint (GP_ERR, "  <photcode>:ave : average magnitude for <photcode>\n");
     gprint (GP_ERR, "  <photcode>:ref : reference magnitude system for <photcode>\n");
@@ -206 +227 @@
     gprint (GP_ERR, "  <photcode>:err : magnitude error for photcode\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");
-    gprint (GP_ERR, "  <photcode>:ncode : number of measurements in photcode \n");
-    gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for photcode average\n");
+    gprint (GP_ERR, "  <photcode>:ncode : number of measurements matching photcode \n");
+    gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude in this photcode\n");
+
+    // gprint (GP_ERR, "  Xp : NOT VALID\n");
+    // gprint (GP_ERR, "  type : dophot type (unused)\n");
+    // gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");
     return (FALSE);
   }