IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 27587


Ignore:
Timestamp:
Apr 2, 2010, 4:01:44 PM (16 years ago)
Author:
eugene
Message:

added list -copy option; added mextract, avextract features to support all existing fields; filled out the --help fields

Location:
trunk/Ohana/src/opihi
Files:
11 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/opihi/cmd.basic/list.c

    r25965 r27587  
    7474    set_int_variable (line, nWords);
    7575
     76    return (TRUE);
     77  }
     78
     79  // return an error if -copy is given with no other args
     80  if ((argc > 2) && (!strcmp (argv[2], "-copy"))) {
     81    char *value;
     82    if (argc == 3) {
     83      gprint (GP_ERR, "USAGE: list (newlist) -copy (oldlist) ...\n");
     84      return (FALSE);
     85    }
     86   
     87    sprintf (line, "%s:n", argv[3]);
     88    N = get_int_variable (line, &found);
     89    sprintf (line, "%s:n", argv[1]);
     90    set_int_variable (line, N);
     91    for (i = 0; i < N; i++) {
     92      sprintf (line, "%s:%d", argv[3], i);
     93      value = get_variable (line);
     94      sprintf (line, "%s:%d", argv[1], i);
     95      set_str_variable (line, value);
     96    }
    7697    return (TRUE);
    7798  }

  • trunk/Ohana/src/opihi/dvo/avextract.c

    r27435 r27587  
    185185    gprint (GP_ERR, "  RA : right ascension (J2000) [degrees]\n");
    186186    gprint (GP_ERR, "  DEC : declination [degrees]\n");
     187    gprint (GP_ERR, "  GLON : galactic longitude [degrees]\n");
     188    gprint (GP_ERR, "  GLAT : galactic latitude [degrees]\n");
     189    gprint (GP_ERR, "  ELON : ecliptic longitude [degrees]\n");
     190    gprint (GP_ERR, "  ELAT : ecliptic latitude [degrees]\n");
    187191    gprint (GP_ERR, "  dRA : ra scatter [degrees]\n");
    188192    gprint (GP_ERR, "  dDEC : dec scatter [degrees]\n");
    … …  
    193197    gprint (GP_ERR, "  PAR : parallax\n");
    194198    gprint (GP_ERR, "  dPAR : parallax error \n");
    195     gprint (GP_ERR, "  nmeas : number of measurements\n");
    196     gprint (GP_ERR, "  nmiss : number of non-detections\n");
    197     gprint (GP_ERR, "  xp : positional raw chi-square\n");
    198     gprint (GP_ERR, "  flag : object flags\n");
     199
     200    gprint (GP_ERR, "  ChiSqPos : chi square of position fit \n");
     201    gprint (GP_ERR, "  ChiSqPM  : chi square of proper-motion fit \n");
     202    gprint (GP_ERR, "  ChiSqPar : chi square of parallax fit \n");
     203
     204    gprint (GP_ERR, "  Tmean : mean epoch (reference for proper motion)\n");
     205    gprint (GP_ERR, "  Trange : range of times used for proper motion/parallax fit\n");
     206
     207    gprint (GP_ERR, "  Nmeas : number of measurements\n");
     208    gprint (GP_ERR, "  Nmiss : number of non-detections\n");
     209    gprint (GP_ERR, "  Npos  : number of measurments used for astrometry\n");
     210    gprint (GP_ERR, "  Nastrom  : number of measurments used for astrometry (= Npos)\n");
     211
     212    gprint (GP_ERR, "  flags     : object flags\n");
     213    gprint (GP_ERR, "  objflags  : object flags\n");
     214    gprint (GP_ERR, "  obj_flags : object flags\n");
     215
     216    gprint (GP_ERR, "  objID : object ID (32 bit, unique in catalog)\n");
     217    gprint (GP_ERR, "  catID : catalog ID (32 bit)\n");
     218    gprint (GP_ERR, "  extID_hi : external ID (upper 32 of 64 bit) -- eg, PSPS ID\n");
     219    gprint (GP_ERR, "  extID_lo : external ID (lower 32 of 64 bit) -- eg, PSPS ID\n");
     220
    199221    gprint (GP_ERR, "  <photcode>:ave : average magnitude for <photcode>\n");
    200222    gprint (GP_ERR, "  <photcode>:ref : reference magnitude system for <photcode>\n");
    … …  
    206228    gprint (GP_ERR, "  <photcode>:err : magnitude error for photcode\n");
    207229    gprint (GP_ERR, "  <photcode>:chisq : raw chi-square of magnitude fit\n");
    208     gprint (GP_ERR, "  type : dophot type (unused)\n");
    209     gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");
    210     gprint (GP_ERR, "  <photcode>:ncode : number of measurements in photcode \n");
    211     gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for photcode average\n");
     230    gprint (GP_ERR, "  <photcode>:ncode : number of measurements matching photcode \n");
     231    gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude in this photcode\n");
     232
     233    // gprint (GP_ERR, "  Xp : NOT VALID\n");
     234    // gprint (GP_ERR, "  type : dophot type (unused)\n");
     235    // gprint (GP_ERR, "  typefrac : dophot type fraction (unused)\n");
    212236    return (FALSE);
    213237  }

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

    r27435 r27587  
    11# include "dvoshell.h"
     2
     3/* time concepts */
     4static time_t TimeReference;
     5static int TimeFormat;
    26
    37static CoordTransform *celestial_to_galactic = NULL;
    … …  
    3438
    3539int dbExtractAveragesInit () {
     40  GetTimeFormat (&TimeReference, &TimeFormat);
    3641  haveGalactic = FALSE;
    3742  haveEcliptic = FALSE;
    … …  
    118123      value.Int = average[0].Nmissing;
    119124      break;
     125    case AVE_NPOS:
     126      value.Int = average[0].Npos;
     127      break;
     128
     129    case AVE_CHISQ_POS:
     130      value.Flt = average[0].ChiSqAve;
     131      break;
     132    case AVE_CHISQ_PM:
     133      value.Flt = average[0].ChiSqPM;
     134      break;
     135    case AVE_CHISQ_PAR:
     136      value.Flt = average[0].ChiSqPar;
     137      break;
     138
     139    case AVE_TMEAN:
     140      value.Flt = TimeValue (average[0].Tmean, TimeReference, TimeFormat);
     141      break;
     142    case AVE_TRANGE:
     143      value.Flt = TimeValue (average[0].Trange, 0, TimeFormat);
     144      break;
     145
    120146    case AVE_Xp:
    121147      value.Flt = 0.01*average[0].Xp;
    122148      break;
    123     case AVE_FLAG:
     149
     150    case AVE_OBJ_FLAGS:
    124151      value.Int = average[0].flags;
    125152      break;
    … …  
    129156    case AVE_CATID:
    130157      value.Int = average[0].catID;
     158      break;
     159    case AVE_EXTID_HI:
     160      value.Int = (0x00000000FFFFFFFF & (average[0].extID >> 32));
     161      break;
     162    case AVE_EXTID_LO:
     163      value.Int = (0x00000000FFFFFFFF & average[0].extID);
    131164      break;
    132165

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

    r27435 r27587  
    246246      value.Flt = image[N].Myyyy + 0x8000;
    247247      break;
    248     case IMAGE_FLAG:
     248    case IMAGE_FLAGS:
    249249      value.Int = image[N].flags;
    250250      break;

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

    r26285 r27587  
    1010static int TimeFormat;
    1111
    12 static time_t TimeRefPM;
    13 
    1412static CoordTransform *celestial_to_galactic = NULL;
    1513static CoordTransform *celestial_to_ecliptic = NULL;
    … …  
    3230
    3331int dbExtractMeasuresInit () {
    34   TimeRefPM = ohana_date_to_sec ("2000/01/01");
    3532  GetTimeFormat (&TimeReference, &TimeFormat);
    3633  return (TRUE);
    … …  
    252249      value.Flt = average[0].D;
    253250      break;
    254     case MEAS_XP: /* OK */
    255       value.Flt = average[0].Xp;
     251    case MEAS_CHISQ_POS: /* OK */
     252      value.Flt = average[0].ChiSqAve;
     253      break;
     254    case MEAS_CHISQ_PM: /* OK */
     255      value.Flt = average[0].ChiSqPM;
     256      break;
     257    case MEAS_CHISQ_PAR: /* OK */
     258      value.Flt = average[0].ChiSqPar;
     259      break;
     260    case MEAS_TMEAN: /* OK */
     261      value.Flt = TimeValue (average[0].Tmean, TimeReference, TimeFormat);
     262      break;
     263    case MEAS_TRANGE: /* OK */
     264      value.Flt = TimeValue (average[0].Trange, 0, TimeFormat);
    256265      break;
    257266    case MEAS_NMEAS: /* OK */
    … …  
    261270      value.Int = average[0].Nmissing;
    262271      break;
    263     case MEAS_OBJFLAGS: /* OK */
     272    case MEAS_NPOS: /* OK */
     273      value.Int = average[0].Npos;
     274      break;
     275    case MEAS_OBJ_FLAGS: /* OK */
    264276      value.Int = average[0].flags;
    265277      break;
    … …  
    273285      break;
    274286    case MEAS_RA_FIT_OFFSET: /* OK */
    275       dT = (measure[0].t - TimeRefPM) / (86400*365.25);
     287      dT = (measure[0].t - average[0].Tmean) / (86400*365.25);
    276288      value.Flt = average[0].uR * dT + measure[0].dR;
    277289      break;
    278290    case MEAS_DEC_FIT_OFFSET: /* OK */
    279       dT = (measure[0].t - TimeRefPM) / (86400*365.25);
     291      dT = (measure[0].t - average[0].Tmean) / (86400*365.25);
    280292      value.Flt = average[0].uD * dT + measure[0].dD;
    281293      break;
    … …  
    315327    case MEAS_THETA: /* OK */
    316328      value.Flt = measure[0].theta;
     329      break;
     330    case MEAS_MXX: /* OK */
     331      value.Flt = measure[0].Mxx;
     332      break;
     333    case MEAS_MXY: /* OK */
     334      value.Flt = measure[0].Mxy;
     335      break;
     336    case MEAS_MYY: /* OK */
     337      value.Flt = measure[0].Myy;
    317338      break;
    318339    case MEAS_DOPHOT: /* OK */
    … …  
    358379      break;
    359380    case MEAS_XCCD_ERR: /* OK */
    360       value.Flt = measure[0].dXccd;
     381      value.Flt = measure[0].dXccd / 100.0;
    361382      break;
    362383    case MEAS_YCCD_ERR: /* OK */
    363       value.Flt = measure[0].dYccd;
     384      value.Flt = measure[0].dYccd / 100.0;
    364385      break;
    365386    case MEAS_XMOSAIC: /* OK */
    … …  
    404425      value.Flt = measure[0].psfChisq;
    405426      break;
     427    case MEAS_PSF_NDOF: /* OK */
     428      value.Int = measure[0].psfNdof;
     429      break;
     430    case MEAS_PSF_NPIX: /* OK */
     431      value.Int = measure[0].psfNpix;
     432      break;
    406433    case MEAS_CR_NSIGMA: /* OK */
    407434      value.Flt = measure[0].crNsigma;

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

    r26285 r27587  
    159159  if (!strcasecmp (fieldName, "dR:ERR"))         ESCAPE (MEAS_RA_OFFSET_ERR,  MAG_NONE, OPIHI_FLT);
    160160  if (!strcasecmp (fieldName, "dD:ERR"))         ESCAPE (MEAS_DEC_OFFSET_ERR, MAG_NONE, OPIHI_FLT);
    161   if (!strcasecmp (fieldName, "xp"))             ESCAPE (MEAS_XP,             MAG_NONE, OPIHI_FLT);
     161  if (!strcasecmp (fieldName, "ChiSqPos"))       ESCAPE (MEAS_CHISQ_POS,      MAG_NONE, OPIHI_FLT);
     162  if (!strcasecmp (fieldName, "ChiSqPM"))        ESCAPE (MEAS_CHISQ_PM,       MAG_NONE, OPIHI_FLT);
     163  if (!strcasecmp (fieldName, "ChiSqPar"))       ESCAPE (MEAS_CHISQ_PAR,      MAG_NONE, OPIHI_FLT);
     164  if (!strcasecmp (fieldName, "Tmean"))          ESCAPE (MEAS_TMEAN,          MAG_NONE, OPIHI_FLT);
     165  if (!strcasecmp (fieldName, "Trange"))         ESCAPE (MEAS_TRANGE,         MAG_NONE, OPIHI_FLT);
    162166  if (!strcasecmp (fieldName, "nmeas"))          ESCAPE (MEAS_NMEAS,          MAG_NONE, OPIHI_INT);
    163167  if (!strcasecmp (fieldName, "nmiss"))          ESCAPE (MEAS_NMISS,          MAG_NONE, OPIHI_INT);
    164   if (!strcasecmp (fieldName, "objflags"))       ESCAPE (MEAS_OBJFLAGS,       MAG_NONE, OPIHI_INT);
     168  if (!strcasecmp (fieldName, "npos"))           ESCAPE (MEAS_NPOS,           MAG_NONE, OPIHI_INT);
     169  if (!strcasecmp (fieldName, "OBJFLAGS"))       ESCAPE (MEAS_OBJ_FLAGS,      MAG_NONE, OPIHI_INT);
     170  if (!strcasecmp (fieldName, "OBJ_FLAGS"))      ESCAPE (MEAS_OBJ_FLAGS,      MAG_NONE, OPIHI_INT);
     171  if (!strcasecmp (fieldName, "DB_FLAGS"))       ESCAPE (MEAS_DB_FLAGS,       MAG_NONE, OPIHI_INT);
     172  if (!strcasecmp (fieldName, "PHOT_FLAGS"))     ESCAPE (MEAS_PHOT_FLAGS,     MAG_NONE, OPIHI_INT);
     173  if (!strcasecmp (fieldName, "DBFLAGS"))        ESCAPE (MEAS_DB_FLAGS,       MAG_NONE, OPIHI_INT);
     174  if (!strcasecmp (fieldName, "PHOTFLAGS"))      ESCAPE (MEAS_PHOT_FLAGS,     MAG_NONE, OPIHI_INT);
    165175  if (!strcasecmp (fieldName, "AIRMASS"))        ESCAPE (MEAS_AIRMASS,        MAG_NONE, OPIHI_FLT);
    166176  if (!strcasecmp (fieldName, "ALT"))            ESCAPE (MEAS_ALT,            MAG_NONE, OPIHI_FLT);
    … …  
    174184  if (!strcasecmp (fieldName, "FWHM_MIN"))       ESCAPE (MEAS_FWHM_MIN,       MAG_NONE, OPIHI_FLT);
    175185  if (!strcasecmp (fieldName, "THETA"))          ESCAPE (MEAS_THETA,          MAG_NONE, OPIHI_FLT);
     186  if (!strcasecmp (fieldName, "POSANGLE"))       ESCAPE (MEAS_POSANGLE,       MAG_NONE, OPIHI_FLT);
     187  if (!strcasecmp (fieldName, "PLATESCALE"))     ESCAPE (MEAS_PLATESCALE,     MAG_NONE, OPIHI_FLT);
     188  if (!strcasecmp (fieldName, "MXX"))            ESCAPE (MEAS_MXX,            MAG_NONE, OPIHI_FLT);
     189  if (!strcasecmp (fieldName, "MYY"))            ESCAPE (MEAS_MYY,            MAG_NONE, OPIHI_FLT);
     190  if (!strcasecmp (fieldName, "MXY"))            ESCAPE (MEAS_MXY,            MAG_NONE, OPIHI_FLT);
    176191  if (!strcasecmp (fieldName, "DOPHOT"))         ESCAPE (MEAS_DOPHOT,         MAG_NONE, OPIHI_INT);
    177   if (!strcasecmp (fieldName, "DB_FLAGS"))       ESCAPE (MEAS_DB_FLAGS,       MAG_NONE, OPIHI_INT);
    178   if (!strcasecmp (fieldName, "PHOT_FLAGS"))     ESCAPE (MEAS_PHOT_FLAGS,     MAG_NONE, OPIHI_INT);
    179192  if (!strcasecmp (fieldName, "XCCD"))           ESCAPE (MEAS_XCCD,           MAG_NONE, OPIHI_FLT);
    180193  if (!strcasecmp (fieldName, "YCCD"))           ESCAPE (MEAS_YCCD,           MAG_NONE, OPIHI_FLT);
    … …  
    193206  if (!strcasecmp (fieldName, "PSF_QF"))         ESCAPE (MEAS_PSF_QF,         MAG_NONE, OPIHI_FLT);
    194207  if (!strcasecmp (fieldName, "PSF_CHISQ"))      ESCAPE (MEAS_PSF_CHISQ,      MAG_NONE, OPIHI_FLT);
     208  if (!strcasecmp (fieldName, "PSF_NDOF"))       ESCAPE (MEAS_PSF_NDOF,       MAG_NONE, OPIHI_INT);
     209  if (!strcasecmp (fieldName, "PSF_NPIX"))       ESCAPE (MEAS_PSF_NPIX,       MAG_NONE, OPIHI_INT);
    195210  if (!strcasecmp (fieldName, "CR_NSIGMA"))      ESCAPE (MEAS_CR_NSIGMA,      MAG_NONE, OPIHI_FLT);
    196211  if (!strcasecmp (fieldName, "EXT_NSIGMA"))     ESCAPE (MEAS_EXT_NSIGMA,     MAG_NONE, OPIHI_FLT);
    … …  
    253268  }
    254269
    255   if (!strcasecmp (fieldName, "RA"))    ESCAPE (AVE_RA,        MAG_NONE, OPIHI_FLT);
    256   if (!strcasecmp (fieldName, "DEC"))   ESCAPE (AVE_DEC,       MAG_NONE, OPIHI_FLT);
    257   if (!strcasecmp (fieldName, "GLON"))  ESCAPE (AVE_GLON,      MAG_NONE, OPIHI_FLT);
    258   if (!strcasecmp (fieldName, "GLAT"))  ESCAPE (AVE_GLAT,      MAG_NONE, OPIHI_FLT);
    259   if (!strcasecmp (fieldName, "ELON"))  ESCAPE (AVE_ELON,      MAG_NONE, OPIHI_FLT);
    260   if (!strcasecmp (fieldName, "ELAT"))  ESCAPE (AVE_ELAT,      MAG_NONE, OPIHI_FLT);
    261   if (!strcasecmp (fieldName, "dRA"))   ESCAPE (AVE_RA_ERR,    MAG_NONE, OPIHI_FLT);
    262   if (!strcasecmp (fieldName, "dDEC"))  ESCAPE (AVE_DEC_ERR,   MAG_NONE, OPIHI_FLT);
    263   if (!strcasecmp (fieldName, "uRA"))   ESCAPE (AVE_U_RA,      MAG_NONE, OPIHI_FLT);
    264   if (!strcasecmp (fieldName, "uDEC"))  ESCAPE (AVE_U_DEC,     MAG_NONE, OPIHI_FLT);
    265   if (!strcasecmp (fieldName, "duRA"))  ESCAPE (AVE_U_RA_ERR,  MAG_NONE, OPIHI_FLT);
    266   if (!strcasecmp (fieldName, "duDEC")) ESCAPE (AVE_U_DEC_ERR, MAG_NONE, OPIHI_FLT);
    267   if (!strcasecmp (fieldName, "PAR"))   ESCAPE (AVE_PAR,       MAG_NONE, OPIHI_FLT);
    268   if (!strcasecmp (fieldName, "dPAR"))  ESCAPE (AVE_PAR_ERR,   MAG_NONE, OPIHI_FLT);
    269   if (!strcasecmp (fieldName, "Xp"))    ESCAPE (AVE_Xp,        MAG_NONE, OPIHI_FLT);
    270   if (!strcasecmp (fieldName, "NMEAS")) ESCAPE (AVE_NMEAS,     MAG_NONE, OPIHI_INT);
    271   if (!strcasecmp (fieldName, "NMISS")) ESCAPE (AVE_NMISS,     MAG_NONE, OPIHI_INT);
    272   if (!strcasecmp (fieldName, "FLAG"))  ESCAPE (AVE_FLAG,      MAG_NONE, OPIHI_INT);
    273   if (!strcasecmp (fieldName, "TYPE"))  ESCAPE (AVE_TYPE,      MAG_NONE, OPIHI_INT);
    274   if (!strcasecmp (fieldName, "OBJID")) ESCAPE (AVE_OBJID,     MAG_NONE, OPIHI_INT);
    275   if (!strcasecmp (fieldName, "CATID")) ESCAPE (AVE_CATID,     MAG_NONE, OPIHI_INT);
    276 
     270  if (!strcasecmp (fieldName, "RA"))        ESCAPE (AVE_RA,        MAG_NONE, OPIHI_FLT);
     271  if (!strcasecmp (fieldName, "DEC"))       ESCAPE (AVE_DEC,       MAG_NONE, OPIHI_FLT);
     272  if (!strcasecmp (fieldName, "GLON"))      ESCAPE (AVE_GLON,      MAG_NONE, OPIHI_FLT);
     273  if (!strcasecmp (fieldName, "GLAT"))      ESCAPE (AVE_GLAT,      MAG_NONE, OPIHI_FLT);
     274  if (!strcasecmp (fieldName, "ELON"))      ESCAPE (AVE_ELON,      MAG_NONE, OPIHI_FLT);
     275  if (!strcasecmp (fieldName, "ELAT"))      ESCAPE (AVE_ELAT,      MAG_NONE, OPIHI_FLT);
     276  if (!strcasecmp (fieldName, "dRA"))       ESCAPE (AVE_RA_ERR,    MAG_NONE, OPIHI_FLT);
     277  if (!strcasecmp (fieldName, "dDEC"))      ESCAPE (AVE_DEC_ERR,   MAG_NONE, OPIHI_FLT);
     278  if (!strcasecmp (fieldName, "uRA"))       ESCAPE (AVE_U_RA,      MAG_NONE, OPIHI_FLT);
     279  if (!strcasecmp (fieldName, "uDEC"))      ESCAPE (AVE_U_DEC,     MAG_NONE, OPIHI_FLT);
     280  if (!strcasecmp (fieldName, "duRA"))      ESCAPE (AVE_U_RA_ERR,  MAG_NONE, OPIHI_FLT);
     281  if (!strcasecmp (fieldName, "duDEC"))     ESCAPE (AVE_U_DEC_ERR, MAG_NONE, OPIHI_FLT);
     282  if (!strcasecmp (fieldName, "PAR"))       ESCAPE (AVE_PAR,       MAG_NONE, OPIHI_FLT);
     283  if (!strcasecmp (fieldName, "dPAR"))      ESCAPE (AVE_PAR_ERR,   MAG_NONE, OPIHI_FLT);
     284  if (!strcasecmp (fieldName, "ChiSqPos"))  ESCAPE (AVE_CHISQ_POS, MAG_NONE, OPIHI_FLT);
     285  if (!strcasecmp (fieldName, "ChiSqPM"))   ESCAPE (AVE_CHISQ_PM, MAG_NONE, OPIHI_FLT);
     286  if (!strcasecmp (fieldName, "ChiSqPar"))  ESCAPE (AVE_CHISQ_PAR, MAG_NONE, OPIHI_FLT);
     287  if (!strcasecmp (fieldName, "Tmean"))     ESCAPE (AVE_TMEAN,     MAG_NONE, OPIHI_FLT);
     288  if (!strcasecmp (fieldName, "Trange"))    ESCAPE (AVE_TRANGE,    MAG_NONE, OPIHI_FLT);
     289  if (!strcasecmp (fieldName, "NMEAS"))     ESCAPE (AVE_NMEAS,     MAG_NONE, OPIHI_INT);
     290  if (!strcasecmp (fieldName, "NMISS"))     ESCAPE (AVE_NMISS,     MAG_NONE, OPIHI_INT);
     291  if (!strcasecmp (fieldName, "NPOS"))      ESCAPE (AVE_NPOS,      MAG_NONE, OPIHI_INT);
     292  if (!strcasecmp (fieldName, "NASTROM"))   ESCAPE (AVE_NPOS,      MAG_NONE, OPIHI_INT);
     293  if (!strcasecmp (fieldName, "FLAGS"))     ESCAPE (AVE_OBJ_FLAGS, MAG_NONE, OPIHI_INT);
     294  if (!strcasecmp (fieldName, "OBJ_FLAGS")) ESCAPE (AVE_OBJ_FLAGS, MAG_NONE, OPIHI_INT);
     295  if (!strcasecmp (fieldName, "OBJFLAGS"))  ESCAPE (AVE_OBJ_FLAGS, MAG_NONE, OPIHI_INT);
     296  if (!strcasecmp (fieldName, "OBJID"))     ESCAPE (AVE_OBJID,     MAG_NONE, OPIHI_INT);
     297  if (!strcasecmp (fieldName, "CATID"))     ESCAPE (AVE_CATID,     MAG_NONE, OPIHI_INT);
     298  if (!strcasecmp (fieldName, "EXTID_HI"))  ESCAPE (AVE_EXTID_HI,  MAG_NONE, OPIHI_INT);
     299  if (!strcasecmp (fieldName, "EXTID_LO"))  ESCAPE (AVE_EXTID_LO,  MAG_NONE, OPIHI_INT);
     300
     301  // if (!strcasecmp (fieldName, "Xp"))      ESCAPE (AVE_Xp,        MAG_NONE, OPIHI_FLT);
     302  // if (!strcasecmp (fieldName, "TYPE"))    ESCAPE (AVE_TYPE,      MAG_NONE, OPIHI_INT);
    277303  // for words that don't parse, try a photcode
    278304
    … …  
    375401  if (!strcasecmp (fieldName, "sky"      )) ESCAPE (IMAGE_SKY,       MAG_NONE, OPIHI_FLT);
    376402
    377   if (!strcasecmp (fieldName, "flag"     )) ESCAPE (IMAGE_FLAG,      MAG_NONE, OPIHI_INT);
     403  if (!strcasecmp (fieldName, "imflags"  )) ESCAPE (IMAGE_FLAGS,     MAG_NONE, OPIHI_INT);
     404  if (!strcasecmp (fieldName, "flags"    )) ESCAPE (IMAGE_FLAGS,     MAG_NONE, OPIHI_INT);
    378405  if (!strcasecmp (fieldName, "ccdnum"   )) ESCAPE (IMAGE_CCDNUM,    MAG_NONE, OPIHI_INT);
    379406

  • trunk/Ohana/src/opihi/dvo/imextract.c

    r27435 r27587  
    201201    gprint (GP_ERR, "  sky : mean background flux\n");
    202202
    203     gprint (GP_ERR, "  flag : processing bit flags\n");
     203    gprint (GP_ERR, "  imflags : processing bit flags\n");
     204    gprint (GP_ERR, "  flags : processing bit flags\n");
    204205    gprint (GP_ERR, "  ccdnum : identifier for CCD\n");
    205206

  • trunk/Ohana/src/opihi/dvo/mextract.c

    r27435 r27587  
    209209    gprint (GP_ERR, "  RA:err : ra scatter [degrees] \n");
    210210    gprint (GP_ERR, "  DEC:err : dec scatter [degrees]\n");
     211    gprint (GP_ERR, "  GLON : galactic longitude [degrees]\n");
     212    gprint (GP_ERR, "  GLAT : galactic latitude [degrees]\n");
     213    gprint (GP_ERR, "  GLON:ave : average galactic longitude [degrees]\n");
     214    gprint (GP_ERR, "  GLAT:ave : average galactic latitude [degrees]\n");
     215    gprint (GP_ERR, "  ELON : ecliptic longitude [degrees]\n");
     216    gprint (GP_ERR, "  ELAT : ecliptic latitude [degrees]\n");
     217    gprint (GP_ERR, "  ELON:ave : average ecliptic longitude [degrees]\n");
     218    gprint (GP_ERR, "  ELAT:ave : average ecliptic latitude [degrees]\n");
    211219    gprint (GP_ERR, "  uRA : proper motion in ra [mas/yr]\n");
    212220    gprint (GP_ERR, "  uDEC : proper motion in dec [mas/yr]\n");
    … …  
    215223    gprint (GP_ERR, "  PAR : parallax\n");
    216224    gprint (GP_ERR, "  dPAR : parallax error \n");
    217     gprint (GP_ERR, "  nmeas : number of measurements\n");
    218     gprint (GP_ERR, "  nmiss : number of non-detections\n");
    219     gprint (GP_ERR, "  xp : positional raw chi-square\n");
    220     gprint (GP_ERR, "  objflag : object flags\n");
     225
     226    gprint (GP_ERR, "  dR : ra offset [arcseconds]\n");
     227    gprint (GP_ERR, "  dD : dec offset [arcseconds]\n");
     228    gprint (GP_ERR, "  dR:fit : ra offset from fit [arcseconds]\n");
     229    gprint (GP_ERR, "  dD:fit : dec offset from fit [arcseconds]\n");
     230    gprint (GP_ERR, "  dR:err : ra offset error [arcseconds]\n");
     231    gprint (GP_ERR, "  dD:err : dec offset error [arcseconds]\n");
     232
     233    gprint (GP_ERR, "  ChiSqPos : chi square of position fit \n");
     234    gprint (GP_ERR, "  ChiSqPM  : chi square of proper-motion fit \n");
     235    gprint (GP_ERR, "  ChiSqPar : chi square of parallax fit \n");
     236
     237    gprint (GP_ERR, "  Tmean : mean epoch (reference for proper motion)\n");
     238    gprint (GP_ERR, "  Trange : range of times used for proper motion/parallax fit\n");
     239
     240
     241    gprint (GP_ERR, "  Nmeas : number of measurements\n");
     242    gprint (GP_ERR, "  Nmiss : number of non-detections\n");
     243    gprint (GP_ERR, "  Npos  : number of measurments used for astrometry\n");
     244
     245    gprint (GP_ERR, "  objflags  : object flags\n");
     246    gprint (GP_ERR, "  photflags : detection flags from image analysis\n");
     247    gprint (GP_ERR, "  dbflags : detection flags from database analysis\n");
     248
     249    gprint (GP_ERR, "  obj_flags : object flags\n");
     250    gprint (GP_ERR, "  phot_flags : detection flags from image analysis\n");
     251    gprint (GP_ERR, "  db_flags : detection flags from database analysis\n");
     252
    221253    gprint (GP_ERR, "  <photcode>:ave : average magnitude for photcode (or equivalent)\n");
    222254    gprint (GP_ERR, "  <photcode>:ref : reference magnitude system for photcode (or equivalent)\n");
    … …  
    227259    gprint (GP_ERR, "  <photcode>:cal :  calibrated magnitude for photcode \n");
    228260    gprint (GP_ERR, "  <photcode>:err :  magnitude error for measurement\n");
     261    gprint (GP_ERR, "  <photcode>:ap :  catalog aperture magnitude for photcode\n");
     262    gprint (GP_ERR, "  <photcode>:aper :  catalog aperture magnitude for photcode\n");
    229263    gprint (GP_ERR, "  <photcode>:aveerr : average error (stdev)\n");
    230264    gprint (GP_ERR, "  <photcode>:chisq : raw chi-square of magnitude fit\n");
    … …  
    232266    gprint (GP_ERR, "  <photcode>:nphot : number of measurements used for average magnitude\n");
    233267    gprint (GP_ERR, "  airmass : airmass of detection\n");
     268    gprint (GP_ERR, "  alt : altitude of detection\n");
     269    gprint (GP_ERR, "  az  : azimuth of detection\n");
    234270    gprint (GP_ERR, "  exptime : exposure time [s]\n");
    235271    gprint (GP_ERR, "  photcode : photcode \n");
     272    gprint (GP_ERR, "  photcode:equiv : equivalent average photcode \n");
    236273    gprint (GP_ERR, "  time : time of exposure [Seconds since Jan 1, 1970/\n");
    237     gprint (GP_ERR, "  dR : ra offset [arcseconds]\n");
    238     gprint (GP_ERR, "  dD : dec offset [arcseconds]\n");
    239     gprint (GP_ERR, "  fwhm : fwhm (average) [pixels]\n");
    240     gprint (GP_ERR, "  fwhm_maj : fwhm (major axis) [pixels]\n");
    241     gprint (GP_ERR, "  fwhm_min : fwhm (minor axis) [pixels]\n");
    242     gprint (GP_ERR, "  theta : position angle\n");
    243     gprint (GP_ERR, "  flags : detection flags\n");
     274    gprint (GP_ERR, "  fwhm : fwhm (average) of fitted PSF [pixels]\n");
     275    gprint (GP_ERR, "  fwhm_maj : fwhm (major axis) of fitted PSF [pixels]\n");
     276    gprint (GP_ERR, "  fwhm_min : fwhm (minor axis) of fitted PSF [pixels]\n");
     277    gprint (GP_ERR, "  theta : position angle of fitted PSF\n");
     278    gprint (GP_ERR, "  posangle : position angle of detector at measurement [degrees]\n");
     279    gprint (GP_ERR, "  platescale : plate scale of detector at measurement [arcsec/pixel] \n");
     280
     281    gprint (GP_ERR, "  psf_qf : PSF quality factor (psf-weighted mask fraction)\n");
     282    gprint (GP_ERR, "  psf_chisq : PSF fit chi square\n");
     283    gprint (GP_ERR, "  psf_ndof : PSF number of degrees of freedom\n");
     284    gprint (GP_ERR, "  psf_npix : PSF number of pixels\n");
     285
     286    gprint (GP_ERR, "  cr_nsigma : Nsigma deviation towards cosmic ray\n");
     287    gprint (GP_ERR, "  ext_nsigma : Nsigma deviation towards extended source\n");
     288
     289    gprint (GP_ERR, "  Mxx : second moment in X [pixels^2]\n");
     290    gprint (GP_ERR, "  Mxy : second moment cross term [pixels^2]\n");
     291    gprint (GP_ERR, "  Myy : second moment in Y [pixels^2]\n");
     292
    244293    gprint (GP_ERR, "  xccd : ccd x position\n");
    245294    gprint (GP_ERR, "  yccd : ccd y position\n");
     295    gprint (GP_ERR, "  xccd:err : ccd x position error\n");
     296    gprint (GP_ERR, "  yccd:err : ccd y position error\n");
    246297    gprint (GP_ERR, "  xmosaic : mosaic x position\n");
    247298    gprint (GP_ERR, "  ymosaic : mosaic y position\n");
    248     gprint (GP_ERR, "  xchip : chip x position\n");
    249     gprint (GP_ERR, "  ychip : chip y position\n");
    250     gprint (GP_ERR, "  xfpa : fpa x position\n");
    251     gprint (GP_ERR, "  yfpa : fpa y position\n");
     299    gprint (GP_ERR, "  xchip : chip x position (= ccd position)\n");
     300    gprint (GP_ERR, "  ychip : chip y position (= ccd position)\n");
     301    gprint (GP_ERR, "  xfpa : fpa x position (= mosaic position)\n");
     302    gprint (GP_ERR, "  yfpa : fpa y position (= mosaic position)\n");
     303
     304    gprint (GP_ERR, "  detID : ID of detection (unique on source image)\n");
     305    gprint (GP_ERR, "  objID : object ID (32 bit, unique in catalog)\n");
     306    gprint (GP_ERR, "  catID : catalog ID (32 bit)\n");
     307    gprint (GP_ERR, "  imageID : ID of source image (32 bit)\n");
    252308    return (FALSE);
    253309  }

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

    r27435 r27587  
    228228  if (!strcasecmp (parname, "Xp"))    param = AVE_Xp;
    229229  if (!strcasecmp (parname, "Xm"))    param = AVE_Xm;
    230   if (!strcasecmp (parname, "flag"))  param = AVE_FLAG;
     230  if (!strcasecmp (parname, "flag"))  param = AVE_OBJ_FLAGS;
    231231  if (!strcasecmp (parname, "type"))  param = AVE_TYPE;
    232232  if (!strcasecmp (parname, "typefrac")) {
    … …  
    641641      value = 0.01*average[0].Xp;
    642642      break;
    643     case AVE_FLAG:
     643    case AVE_OBJ_FLAGS:
    644644      value = average[0].flags;
    645645      break;

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

    r27435 r27587  
    6969      MEAS_RA_OFFSET_ERR,
    7070      MEAS_DEC_OFFSET_ERR,
    71       MEAS_XP,
     71      MEAS_CHISQ_POS,
     72      MEAS_CHISQ_PM, 
     73      MEAS_CHISQ_PAR,
     74      MEAS_TMEAN,
     75      MEAS_TRANGE,
    7276      MEAS_NMEAS,
    7377      MEAS_NMISS,
    74       MEAS_OBJFLAGS,
     78      MEAS_NPOS,
     79      MEAS_OBJ_FLAGS,
    7580      MEAS_MAG,
    7681      MEAS_MINST,
    … …  
    9095      MEAS_FWHM_MIN,
    9196      MEAS_THETA,
     97      MEAS_POSANGLE,
     98      MEAS_PLATESCALE,
     99      MEAS_MXX,
     100      MEAS_MXY,
     101      MEAS_MYY,
    92102      MEAS_DOPHOT,
    93103      MEAS_DB_FLAGS,
    … …  
    107117      MEAS_PSF_QF,
    108118      MEAS_PSF_CHISQ,
     119      MEAS_PSF_NDOF,
     120      MEAS_PSF_NPIX,
    109121      MEAS_CR_NSIGMA,
    110122      MEAS_EXT_NSIGMA,
    … …  
    127139      AVE_PAR,
    128140      AVE_PAR_ERR,
     141      AVE_CHISQ_POS,
     142      AVE_CHISQ_PM,
     143      AVE_CHISQ_PAR,
     144      AVE_TMEAN,
     145      AVE_TRANGE,
    129146      AVE_Xp,
    130147      AVE_NMEAS,
    131148      AVE_NMISS,
     149      AVE_NPOS,
    132150      AVE_NPHOT,
    133151      AVE_NCODE,
    … …  
    135153      AVE_dMAG,
    136154      AVE_Xm,
    137       AVE_FLAG,
     155      AVE_OBJ_FLAGS,
    138156      AVE_TYPE,
    139157      AVE_TYPEFRAC,
    140158      AVE_OBJID,
    141       AVE_CATID
     159      AVE_CATID,
     160      AVE_EXTID_HI,
     161      AVE_EXTID_LO,
    142162};
    143163
    … …  
    160180      IMAGE_NCAL,
    161181      IMAGE_SKY,
    162       IMAGE_FLAG,
     182      IMAGE_FLAGS,
    163183      IMAGE_CCDNUM,
    164184      IMAGE_NX_PIX,

  • trunk/Ohana/src/opihi/lib.shell/ListOps.c

    r26371 r27587  
    190190      if (!strcmp (temp, "-split")) goto escape;
    191191      if (!strcmp (temp, "-splitbychar")) goto escape;
     192      if (!strcmp (temp, "-copy")) goto escape;
    192193      if (!strcmp (temp, "-add")) goto escape;
    193194      if (!strcmp (temp, "-del")) goto escape;
Note: See TracChangeset for help on using the changeset viewer.