IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 20908


Ignore:
Timestamp:
Dec 4, 2008, 6:07:54 PM (17 years ago)
Author:
eugene
Message:

adding additional image fields to imextract

Location:
branches/eam_branch_20081124/Ohana/src/opihi
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20081124/Ohana/src/opihi/dvo/dbExtractImages.c

    r20873 r20908  
    141141      value.Flt = ELAT;
    142142      break;
    143     case IMAGE_XM:
    144       value.Flt = pow(10.0, 0.01*image[N].Xm);
    145       break;
    146     case IMAGE_AIRMASS:
    147       value.Flt = image[N].secz;
    148       break;
    149     case IMAGE_MCAL:
    150       value.Flt = image[N].Mcal;
    151       break;
    152     case IMAGE_dMCAL:
    153       value.Flt = image[N].dMcal;
    154       break;
    155     case IMAGE_PHOTCODE:
    156       value.Int = image[N].photcode;
    157       break;
    158     case IMAGE_TIME:
    159       t = image[N].tzero + 0.5*image[N].NY * image[N].trate / 10000;
    160       value.Flt = TimeValue (t, TimeReference, TimeFormat);
    161       break;
    162     case IMAGE_FWHM:
    163       value.Flt = image[N].fwhm_x / 25.0;
    164       break;
    165     case IMAGE_EXPTIME:
    166       value.Flt = image[N].exptime;
    167       break;
    168     case IMAGE_NSTAR:
    169       value.Int = image[N].nstar;
    170       break;
    171     case IMAGE_NCAL:
    172       value.Int = image[N].Mxxxx;
    173       break;
    174     case IMAGE_SKY:
    175       value.Flt = image[N].Myyyy + 0x8000;
    176       break;
    177     case IMAGE_FLAG:
    178       value.Int = image[N].code;
    179       break;
    180     case IMAGE_NX_PIX:
    181       value.Int = image[N].NX;
    182       break;
    183     case IMAGE_NY_PIX:
    184       value.Int = image[N].NY;
    185       break;
    186     case IMAGE_IMAGE_ID:
    187       value.Int = image[N].imageID;
    188       break;
     143
    189144    case IMAGE_THETA: {
    190145      double theta1, theta2, s1, s2;
    … …  
    216171      break; }
    217172
     173    case IMAGE_TIME:
     174      t = image[N].tzero + 0.5*image[N].NY * image[N].trate / 10000;
     175      value.Flt = TimeValue (t, TimeReference, TimeFormat);
     176      break;
     177    case IMAGE_NSTAR:
     178      value.Int = image[N].nstar;
     179      break;
     180    case IMAGE_AIRMASS:
     181      value.Flt = image[N].secz;
     182      break;
     183    case IMAGE_NX_PIX:
     184      value.Int = image[N].NX;
     185      break;
     186    case IMAGE_NY_PIX:
     187      value.Int = image[N].NY;
     188      break;
     189    case IMAGE_APRESID:
     190      value.Flt = image[N].apmifit;
     191      break;
     192    case IMAGE_DAPRESID:
     193      value.Flt = image[N].dapmifit;
     194      break;
     195
     196    case IMAGE_MCAL:
     197      value.Flt = image[N].Mcal;
     198      break;
     199    case IMAGE_dMCAL:
     200      value.Flt = image[N].dMcal;
     201      break;
     202    case IMAGE_XM:
     203      value.Flt = pow(10.0, 0.01*image[N].Xm);
     204      break;
     205    case IMAGE_PHOTCODE:
     206      value.Int = image[N].photcode;
     207      break;
     208    case IMAGE_EXPTIME:
     209      value.Flt = image[N].exptime;
     210      break;
     211    case IMAGE_SIDTIME:
     212      value.Flt = image[N].sidtime;
     213      break;
     214
     215    case IMAGE_LATITUDE:
     216      value.Flt = image[N].latitude;
     217      break;
     218
     219    case IMAGE_DET_LIMIT:
     220      value.Flt = image[N].detection_limit * 0.1;
     221      break;
     222    case IMAGE_SAT_LIMIT:
     223      value.Flt = image[N].saturation_limit * 0.1;
     224      break;
     225    case IMAGE_CERROR:
     226      value.Flt = image[N].cerror / 50.0;
     227      break;
     228
     229    case IMAGE_FWHM:
     230      value.Flt = (image[N].fwhm_x + image[N].fwhm_y) / 50.0;
     231      break;
     232    case IMAGE_FWHM_MAJ:
     233      value.Flt = image[N].fwhm_x / 25.0;
     234      break;
     235    case IMAGE_FWHM_MIN:
     236      value.Flt = image[N].fwhm_y / 25.0;
     237      break;
     238    case IMAGE_TRATE:
     239      value.Flt = image[N].trate / 10000.0;
     240      break;
     241
     242    case IMAGE_NCAL:
     243      value.Int = image[N].Mxxxx;
     244      break;
     245    case IMAGE_SKY:
     246      value.Flt = image[N].Myyyy + 0x8000;
     247      break;
     248    case IMAGE_FLAG:
     249      value.Int = image[N].code;
     250      break;
     251    case IMAGE_CCDNUM:
     252      value.Int = image[N].ccdnum;
     253      break;
     254
     255    case IMAGE_IMAGE_ID:
     256      value.Int = image[N].imageID;
     257      break;
     258    case IMAGE_EXTERN_ID:
     259      value.Int = image[N].externID;
     260      break;
     261    case IMAGE_SOURCE_ID:
     262      value.Int = image[N].sourceID;
     263      break;
     264
    218265      // reference pixel extractions
    219266    case IMAGE_X_LL_CHIP:

  • branches/eam_branch_20081124/Ohana/src/opihi/dvo/dbFields.c

    r20873 r20908  
    307307  if (!strcasecmp (fieldName, "RA"       )) ESCAPE (IMAGE_RA,        MAG_NONE, OPIHI_FLT);
    308308  if (!strcasecmp (fieldName, "DEC"      )) ESCAPE (IMAGE_DEC,       MAG_NONE, OPIHI_FLT);
    309   if (!strcasecmp (fieldName, "Xm"       )) ESCAPE (IMAGE_XM,        MAG_NONE, OPIHI_FLT);
    310   if (!strcasecmp (fieldName, "airmass"  )) ESCAPE (IMAGE_AIRMASS,   MAG_NONE, OPIHI_FLT);
    311   if (!strcasecmp (fieldName, "Mcal"     )) ESCAPE (IMAGE_MCAL,      MAG_NONE, OPIHI_FLT);
    312   if (!strcasecmp (fieldName, "dMcal"    )) ESCAPE (IMAGE_dMCAL,     MAG_NONE, OPIHI_FLT);
    313   if (!strcasecmp (fieldName, "photcode" )) ESCAPE (IMAGE_PHOTCODE,  MAG_NONE, OPIHI_INT);
    314   if (!strcasecmp (fieldName, "time"     )) ESCAPE (IMAGE_TIME,      MAG_NONE, OPIHI_FLT);
    315   if (!strcasecmp (fieldName, "FWHM"     )) ESCAPE (IMAGE_FWHM,      MAG_NONE, OPIHI_FLT);
    316   if (!strcasecmp (fieldName, "exptime"  )) ESCAPE (IMAGE_EXPTIME,   MAG_NONE, OPIHI_FLT);
    317   if (!strcasecmp (fieldName, "nstar"    )) ESCAPE (IMAGE_NSTAR,     MAG_NONE, OPIHI_INT);
    318   if (!strcasecmp (fieldName, "ncal"     )) ESCAPE (IMAGE_NCAL,      MAG_NONE, OPIHI_INT);
    319   if (!strcasecmp (fieldName, "sky"      )) ESCAPE (IMAGE_SKY,       MAG_NONE, OPIHI_FLT);
    320   if (!strcasecmp (fieldName, "flag"     )) ESCAPE (IMAGE_FLAG,      MAG_NONE, OPIHI_INT);
    321   if (!strcasecmp (fieldName, "NX"       )) ESCAPE (IMAGE_NX_PIX,    MAG_NONE, OPIHI_INT);
    322   if (!strcasecmp (fieldName, "NY"       )) ESCAPE (IMAGE_NY_PIX,    MAG_NONE, OPIHI_INT);
     309  if (!strcasecmp (fieldName, "GLON"     )) ESCAPE (IMAGE_GLON,      MAG_NONE, OPIHI_FLT);
     310  if (!strcasecmp (fieldName, "GLAT"     )) ESCAPE (IMAGE_GLAT,      MAG_NONE, OPIHI_FLT);
     311  if (!strcasecmp (fieldName, "ELON"     )) ESCAPE (IMAGE_ELON,      MAG_NONE, OPIHI_FLT);
     312  if (!strcasecmp (fieldName, "ELAT"     )) ESCAPE (IMAGE_ELAT,      MAG_NONE, OPIHI_FLT);
     313
    323314  if (!strcasecmp (fieldName, "theta"    )) ESCAPE (IMAGE_THETA,     MAG_NONE, OPIHI_FLT);
    324315  if (!strcasecmp (fieldName, "skew"     )) ESCAPE (IMAGE_SKEW,      MAG_NONE, OPIHI_FLT);
    325316  if (!strcasecmp (fieldName, "scale"    )) ESCAPE (IMAGE_SCALE,     MAG_NONE, OPIHI_FLT);
    326317  if (!strcasecmp (fieldName, "dscale"   )) ESCAPE (IMAGE_DSCALE,    MAG_NONE, OPIHI_FLT);
     318
     319  if (!strcasecmp (fieldName, "time"     )) ESCAPE (IMAGE_TIME,      MAG_NONE, OPIHI_FLT);
     320  if (!strcasecmp (fieldName, "nstar"    )) ESCAPE (IMAGE_NSTAR,     MAG_NONE, OPIHI_INT);
     321  if (!strcasecmp (fieldName, "airmass"  )) ESCAPE (IMAGE_AIRMASS,   MAG_NONE, OPIHI_FLT);
     322  if (!strcasecmp (fieldName, "NX"       )) ESCAPE (IMAGE_NX_PIX,    MAG_NONE, OPIHI_INT);
     323  if (!strcasecmp (fieldName, "NY"       )) ESCAPE (IMAGE_NY_PIX,    MAG_NONE, OPIHI_INT);
     324  if (!strcasecmp (fieldName, "apresid"  )) ESCAPE (IMAGE_APRESID,   MAG_NONE, OPIHI_FLT);
     325  if (!strcasecmp (fieldName, "dapresid" )) ESCAPE (IMAGE_DAPRESID,  MAG_NONE, OPIHI_FLT);
     326
     327  if (!strcasecmp (fieldName, "Mcal"     )) ESCAPE (IMAGE_MCAL,      MAG_NONE, OPIHI_FLT);
     328  if (!strcasecmp (fieldName, "dMcal"    )) ESCAPE (IMAGE_dMCAL,     MAG_NONE, OPIHI_FLT);
     329  if (!strcasecmp (fieldName, "Xm"       )) ESCAPE (IMAGE_XM,        MAG_NONE, OPIHI_FLT);
     330  if (!strcasecmp (fieldName, "photcode" )) ESCAPE (IMAGE_PHOTCODE,  MAG_NONE, OPIHI_INT);
     331  if (!strcasecmp (fieldName, "exptime"  )) ESCAPE (IMAGE_EXPTIME,   MAG_NONE, OPIHI_FLT);
     332  if (!strcasecmp (fieldName, "sidtime"  )) ESCAPE (IMAGE_SIDTIME,   MAG_NONE, OPIHI_FLT);
     333
     334  if (!strcasecmp (fieldName, "latitude" )) ESCAPE (IMAGE_LATITUDE,  MAG_NONE, OPIHI_FLT);
     335
     336  if (!strcasecmp (fieldName, "detlimit" )) ESCAPE (IMAGE_DET_LIMIT, MAG_NONE, OPIHI_FLT);
     337  if (!strcasecmp (fieldName, "satlimit" )) ESCAPE (IMAGE_SAT_LIMIT, MAG_NONE, OPIHI_FLT);
     338  if (!strcasecmp (fieldName, "cerror"   )) ESCAPE (IMAGE_CERROR,    MAG_NONE, OPIHI_FLT);
     339
     340  if (!strcasecmp (fieldName, "FWHM"     )) ESCAPE (IMAGE_FWHM,      MAG_NONE, OPIHI_FLT);
     341  if (!strcasecmp (fieldName, "FWHM_MAJ" )) ESCAPE (IMAGE_FWHM_MAJ,  MAG_NONE, OPIHI_FLT);
     342  if (!strcasecmp (fieldName, "FWHM_MIN" )) ESCAPE (IMAGE_FWHM_MIN,  MAG_NONE, OPIHI_FLT);
     343  if (!strcasecmp (fieldName, "trate"    )) ESCAPE (IMAGE_TRATE,     MAG_NONE, OPIHI_FLT);
     344
     345  // XXX : these are mapped to ridiculous things: Myyyy + 0x8000 and Mxxxx
     346  if (!strcasecmp (fieldName, "ncal"     )) ESCAPE (IMAGE_NCAL,      MAG_NONE, OPIHI_INT);
     347  if (!strcasecmp (fieldName, "sky"      )) ESCAPE (IMAGE_SKY,       MAG_NONE, OPIHI_FLT);
     348
     349  if (!strcasecmp (fieldName, "flag"     )) ESCAPE (IMAGE_FLAG,      MAG_NONE, OPIHI_INT);
     350  if (!strcasecmp (fieldName, "ccdnum"   )) ESCAPE (IMAGE_CCDNUM,    MAG_NONE, OPIHI_INT);
     351
    327352  if (!strcasecmp (fieldName, "imageID"  )) ESCAPE (IMAGE_IMAGE_ID,  MAG_NONE, OPIHI_INT);
     353  if (!strcasecmp (fieldName, "externID" )) ESCAPE (IMAGE_EXTERN_ID, MAG_NONE, OPIHI_INT);
     354  if (!strcasecmp (fieldName, "sourceID" )) ESCAPE (IMAGE_SOURCE_ID, MAG_NONE, OPIHI_INT);
     355
    328356  if (!strcasecmp (fieldName, "X_LL_CHIP")) ESCAPE (IMAGE_X_LL_CHIP, MAG_NONE, OPIHI_FLT);
    329357  if (!strcasecmp (fieldName, "X_LR_CHIP")) ESCAPE (IMAGE_X_LR_CHIP, MAG_NONE, OPIHI_FLT);

  • branches/eam_branch_20081124/Ohana/src/opihi/dvo/imextract.c

    r20873 r20908  
    163163    gprint (GP_ERR, "  RA : right ascension of field center (J2000)\n");
    164164    gprint (GP_ERR, "  DEC : declination of field center\n");
    165     gprint (GP_ERR, "  Xm : chisq of photometry calibration\n");
    166     gprint (GP_ERR, "  airmass : mean airmass of exposure\n");
    167     gprint (GP_ERR, "  Mcal : photometry calibration (mags)\n");
    168     gprint (GP_ERR, "  dMcal : photometry calibration error (mags)\n");
    169     gprint (GP_ERR, "  photcode : numeric photcode value for image\n");
    170     gprint (GP_ERR, "  time : time of exposure\n");
    171     gprint (GP_ERR, "  FWHM : mean fwhm of exposure\n");
    172     gprint (GP_ERR, "  exptime : exposure duration (seconds)\n");
    173     gprint (GP_ERR, "  nstar : number of stars detected in exposure\n");
    174     gprint (GP_ERR, "  ncal : number of stars used for photometry calibration\n");
    175     gprint (GP_ERR, "  sky : mean background flux\n");
    176     gprint (GP_ERR, "  flag : processing bit flags\n");
    177     gprint (GP_ERR, "  NX : image dimensions\n");
    178     gprint (GP_ERR, "  NY : image dimensions\n");
     165    gprint (GP_ERR, "  GLON : galactic longitude of field center (J2000)\n");
     166    gprint (GP_ERR, "  GLAT : galactic latitude of field center (J2000)\n");
     167    gprint (GP_ERR, "  ELON : ecliptic longitude of field center (J2000)\n");
     168    gprint (GP_ERR, "  ELAT : ecliptic latitude of field center (J2000)\n");
     169
    179170    gprint (GP_ERR, "  theta : position angle of image\n");
    180171    gprint (GP_ERR, "  skew : distortion from rectangle\n");
    181172    gprint (GP_ERR, "  scale : pixel scale\n");
    182173    gprint (GP_ERR, "  dscale : pixel-scale error (or variation?)\n");
    183     gprint (GP_ERR, "  imageID : unique image identifier\n");
     174
     175    gprint (GP_ERR, "  time : time of exposure\n");
     176    gprint (GP_ERR, "  nstar : number of stars detected in exposure\n");
     177    gprint (GP_ERR, "  airmass : mean airmass of exposure\n");
     178    gprint (GP_ERR, "  NX : image dimensions\n");
     179    gprint (GP_ERR, "  NY : image dimensions\n");
     180
     181    gprint (GP_ERR, "  apresid : aperture - fit magnitude\n");
     182    gprint (GP_ERR, "  dapresid : aperture - fit magnitude scatter\n");
     183
     184    gprint (GP_ERR, "  Mcal : photometry calibration (mags)\n");
     185    gprint (GP_ERR, "  dMcal : photometry calibration error (mags)\n");
     186    gprint (GP_ERR, "  Xm : chisq of photometry calibration\n");
     187    gprint (GP_ERR, "  photcode : numeric photcode value for image\n");
     188    gprint (GP_ERR, "  exptime : exposure duration (seconds)\n");
     189    gprint (GP_ERR, "  sidtime : sidereal time of exposure\n");
     190
     191    gprint (GP_ERR, "  latitude : observatory latitude\n");
     192
     193    gprint (GP_ERR, "  detlimit : detection limit of exposure\n");
     194    gprint (GP_ERR, "  satlimit : saturation limit of exposure\n");
     195    gprint (GP_ERR, "  cerror : astrometric scatter\n");
     196
     197    gprint (GP_ERR, "  FWHM : mean fwhm of exposure\n");
     198    gprint (GP_ERR, "  FWHM_MAJ : fwhm of major axis\n");
     199    gprint (GP_ERR, "  FWHM_MIN : fwhm of minor axis\n");
     200    gprint (GP_ERR, "  trate : tracking rate for TDI images\n");
     201
     202    gprint (GP_ERR, "  ncal : number of stars used for photometry calibration\n");
     203    gprint (GP_ERR, "  sky : mean background flux\n");
     204
     205    gprint (GP_ERR, "  flag : processing bit flags\n");
     206    gprint (GP_ERR, "  ccdnum : identifier for CCD\n");
     207
     208    gprint (GP_ERR, "  imageID  : unique image identifier\n");
     209    gprint (GP_ERR, "  externID : external image identifier\n");
     210    gprint (GP_ERR, "  sourceID : external db reference\n");
     211
    184212    gprint (GP_ERR, "  X_LL_CHIP : chip x-pixel coordinate of lower left corner\n");
    185213    gprint (GP_ERR, "  X_LR_CHIP : chip x-pixel coordinate of lower right corner\n");

  • branches/eam_branch_20081124/Ohana/src/opihi/include/dvoshell.h

    r20873 r20908  
    154154      IMAGE_SKY,
    155155      IMAGE_FLAG,
     156      IMAGE_CCDNUM,
    156157      IMAGE_NX_PIX,
    157158      IMAGE_NY_PIX,
    … …  
    160161      IMAGE_SCALE,
    161162      IMAGE_DSCALE,
     163      IMAGE_APRESID,
     164      IMAGE_DAPRESID,
     165      IMAGE_SIDTIME,
     166      IMAGE_LATITUDE,
     167      IMAGE_DET_LIMIT,
     168      IMAGE_SAT_LIMIT,
     169      IMAGE_CERROR,
     170      IMAGE_FWHM_MAJ,
     171      IMAGE_FWHM_MIN,
     172      IMAGE_TRATE,
    162173      IMAGE_IMAGE_ID,
     174      IMAGE_EXTERN_ID,
     175      IMAGE_SOURCE_ID,
    163176      IMAGE_X_LL_CHIP,
    164177      IMAGE_X_LR_CHIP,
    … …  
    178191      IMAGE_Y_UR_FP,
    179192};
     193
    180194
    181195enum {DVO_TABLE_AVERAGE, DVO_TABLE_MEASURE, DVO_TABLE_IMAGE};
Note: See TracChangeset for help on using the changeset viewer.