IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Mar 4, 2008, 12:39:41 PM (18 years ago)
Author:
eugene
Message:

merge changes from eam_branch_20080223 : updates to DVO output format, addstar (SDSS and 2MASS flags), relastro (FitChip)

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

Legend:

Unmodified
Added
Removed

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

    r15716 r16810  
    100100
    101101    for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
    102       m = catalog.average[j].offset;
     102      m = catalog.average[j].measureOffset;
    103103      // extract the relevant values
    104104      // XXX for measure values, this could be optimized for one loop over measures...

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

    r15509 r16810  
    7272    for (i = 0; i < catalog.Naverage; i++) {
    7373      M1 = M2 = NULL;
    74       m = catalog.average[i].offset;
     74      m = catalog.average[i].measureOffset;
    7575
    7676      SetSelectionParam (0);

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

    r15509 r16810  
    7070    for (i = 0; i < catalog.Naverage; i++) {
    7171      M1 = M3 = NULL;
    72       m = catalog.average[i].offset;
     72      m = catalog.average[i].measureOffset;
    7373
    7474      SetSelectionParam (0);

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

    r15509 r16810  
    4545
    4646    case AVE_NMEAS:
    47       value = average[0].Nm;
     47      value = average[0].Nmeasure;
    4848      break;
    4949    case AVE_NMISS:
    50       value = average[0].Nn;
     50      value = average[0].Nmissing;
    5151      break;
    5252    case AVE_Xp:
    … …  
    7272          // XXX need to code this correctly: this returns just the first matching value
    7373          value = NAN;
    74           for (i = 0; i < average[0].Nm; i++) {
     74          for (i = 0; i < average[0].Nmeasure; i++) {
    7575            if (field->photcode->code != measure[i].photcode) continue;
    7676            value = measure[i].M;

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

    r15509 r16810  
    11# include "dvoshell.h"
     2
     3// to add a new field to the extractions:
     4// 1) add the selection for the field below
     5// 2) add the field to the ParseMeasureField in dbFields.c
     6// 3) add the field to the measure enum list in dvoshell.h
    27
    38/* time concepts */
    … …  
    111116      break;
    112117    case MEAS_NMEAS: /* OK */
    113       value = average[0].Nm;
     118      value = average[0].Nmeasure;
    114119      break;
    115120    case MEAS_NMISS: /* OK */
    116       value = average[0].Nn;
     121      value = average[0].Nmissing;
    117122      break;
    118123    case MEAS_OBJFLAGS: /* OK */
    … …  
    171176    case MEAS_XCCD: /* OK */
    172177/* I need to perform this conversion for ELIXIR and LONEOS formats on load */     
    173 # if 0
     178# if 1
    174179      value = measure[0].Xccd;
    175180# else
    … …  
    184189    case MEAS_YCCD: /* OK */
    185190/* I need to perform this conversion for ELIXIR and LONEOS formats on load */     
    186 # if 0
     191# if 1
    187192      value = measure[0].Yccd;
    188193# else
    … …  
    230235      value = measure[0].qPSF;
    231236      break;
    232     case MEAS_PSF_PROB: /* OK */
    233       value = measure[0].psfProb;
     237    case MEAS_PSF_CHISQ: /* OK */
     238      value = measure[0].psfChisq;
    234239      break;
    235240    case MEAS_CR_NSIGMA: /* OK */

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

    r15208 r16810  
    148148  if (!strcasecmp (fieldName, "IMAGEID"))    ESCAPE (MEAS_IMAGE_ID,     MAG_NONE);
    149149  if (!strcasecmp (fieldName, "PSF_QF"))     ESCAPE (MEAS_PSF_QF,       MAG_NONE);
    150   if (!strcasecmp (fieldName, "PSF_PROB"))   ESCAPE (MEAS_PSF_PROB,     MAG_NONE);
     150  if (!strcasecmp (fieldName, "PSF_CHISQ"))  ESCAPE (MEAS_PSF_CHISQ,    MAG_NONE);
    151151  if (!strcasecmp (fieldName, "CR_NSIGMA"))  ESCAPE (MEAS_CR_NSIGMA,    MAG_NONE);
    152152  if (!strcasecmp (fieldName, "EXT_NSIGMA")) ESCAPE (MEAS_EXT_NSIGMA,   MAG_NONE);

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

    r14401 r16810  
    216216
    217217          M1 = M2 = NULL;
    218           m = catalog[k].average[i].offset;
     218          m = catalog[k].average[i].measureOffset;
    219219
    220220          SetSelectionParam (0);

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

    r16040 r16810  
    207207
    208208      // load the measurements for this source
    209       m = catalog.average[i].offset;
    210       for (j = 0; j < catalog.average[i].Nm; j++) {
     209      m = catalog.average[i].measureOffset;
     210      for (j = 0; j < catalog.average[i].Nmeasure; j++) {
    211211        idx = hashcode[catalog.measure[m+j].photcode];
    212212        if (idx == -1) continue;

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

    r16040 r16810  
    151151        gprint (GP_LOG, "%11.7f ", catalog.average[k].R);
    152152        gprint (GP_LOG, "%11.7f ", catalog.average[k].D);
    153         gprint (GP_LOG, "%3d   ",  catalog.average[k].Nm);
     153        gprint (GP_LOG, "%3d   ",  catalog.average[k].Nmeasure);
    154154        gprint (GP_LOG, "%4.1f ",  0.01*catalog.average[k].Xp);
    155155        gprint (GP_LOG, "%5d",     catalog.average[k].code);
    … …  
    164164            gprint (GP_LOG, "%f",     catalog.average[k].P);
    165165            gprint (GP_LOG, "%f",     catalog.average[k].dP);
    166             gprint (GP_LOG, "%x",     catalog.average[k].objID_hi);
    167             gprint (GP_LOG, "%x",     catalog.average[k].objID_lo);
     166            gprint (GP_LOG, "%x",     catalog.average[k].objID);
     167            gprint (GP_LOG, "%x",     catalog.average[k].catID);
    168168        }
    169169
    … …  
    188188
    189189      if (GetMeasures || SaveVectors) {
    190         m = catalog.average[k].offset;
    191         for (j = 0; j < catalog.average[k].Nm; j++, m++) {
     190        m = catalog.average[k].measureOffset;
     191        for (j = 0; j < catalog.average[k].Nmeasure; j++, m++) {
    192192
    193193          Mcat = PhotCat (&catalog.measure[m]);
    … …  
    209209            if (FULL_OUTPUT) {
    210210                gprint (GP_LOG, "%f", catalog.measure[m].Mcal);
    211                 gprint (GP_LOG, "%f", catalog.measure[m].Mgal);
     211                gprint (GP_LOG, "%f", catalog.measure[m].Map);
    212212                gprint (GP_LOG, "%f", pow(10.0, 0.4*catalog.measure[m].dt));
    213213                gprint (GP_LOG, "%f", 1.0 + catalog.measure[m].airmass);
    … …  
    223223                gprint (GP_LOG, "%d", catalog.measure[m].imageID);
    224224                gprint (GP_LOG, "%f", catalog.measure[m].qPSF);
    225                 gprint (GP_LOG, "%f", catalog.measure[m].psfProb);
     225                gprint (GP_LOG, "%f", catalog.measure[m].psfChisq);
    226226                gprint (GP_LOG, "%f", catalog.measure[m].crNsigma);
    227227                gprint (GP_LOG, "%f", catalog.measure[m].extNsigma);

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

    r14590 r16810  
    11# include "dvoshell.h"
    22
    3 enum {ZERO, RA, DEC, Xm, AIRMASS, MCAL, dMCAL, PHOTCODE, TIME, FWHM, EXPTIME, NSTAR, SKY, NCAL, FLAG, NX_PIX, NY_PIX, THETA, SKEW, SCALE, DSCALE};
     3// need to upgrade this to support multiple fields and WHERE clauses
     4
     5enum {ZERO, RA, DEC, Xm, AIRMASS, MCAL, dMCAL, PHOTCODE, TIME, FWHM, EXPTIME, NSTAR, SKY, NCAL, FLAG, NX_PIX, NY_PIX, THETA, SKEW, SCALE, DSCALE, IMAGE_ID};
    46
    57int imextract (int argc, char **argv) {
    … …  
    9496  if (!strcasecmp (argv[1], "scale")) mode = SCALE;
    9597  if (!strcasecmp (argv[1], "dscale")) mode = DSCALE;
     98  if (!strcasecmp (argv[1], "imageID")) mode = IMAGE_ID;
    9699  if (mode == ZERO) {
    97100    gprint (GP_ERR, "value may be one of the following:\n");
    … …  
    181184        vec[0].elements[N] = image[j].NY;
    182185        break;
     186      case IMAGE_ID:
     187        vec[0].elements[N] = image[j].imageID;
     188        break;
    183189      case THETA: {
    184190        double theta1, theta2, s1, s2;

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

    r16040 r16810  
    122122    if (r < Radius2) {
    123123      /* found star, extract measurements */
    124       m = catalog.average[N1[i]].offset;
    125       for (j = 0; j < catalog.average[N1[i]].Nm; j++, m++) {
     124      m = catalog.average[N1[i]].measureOffset;
     125      for (j = 0; j < catalog.average[N1[i]].Nmeasure; j++, m++) {
    126126        if (ErrorBars) dYvec.elements[N] = catalog.measure[m].dM;
    127127        Xvec.elements[N] = TimeValue (catalog.measure[m].t, TimeReference, TimeFormat);

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

    r16040 r16810  
    105105      k = N1[i];
    106106      /* found star, extract measurements */
    107       m = catalog.average[k].offset;
    108       for (j = 0; j < catalog.average[k].Nm; j++, m++) {
     107      m = catalog.average[k].measureOffset;
     108      for (j = 0; j < catalog.average[k].Nmeasure; j++, m++) {
    109109
    110110        if (PhotCodeSelect) {

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

    r15716 r16810  
    120120
    121121    for (j = 0; (j < catalog.Naverage) && !interrupt; j++) {
    122       m = catalog.average[j].offset;
    123       for (k = 0; (k < catalog.average[j].Nm); k++, m++) {
     122      m = catalog.average[j].measureOffset;
     123      for (k = 0; (k < catalog.average[j].Nmeasure); k++, m++) {
    124124
    125125        // extract the relevant values for this measurement

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

    r15509 r16810  
    562562  *nlist = 0;
    563563  Nlist = 0;
    564   NLIST = MAX (1, average[0].Nm);
     564  NLIST = MAX (1, average[0].Nmeasure);
    565565  ALLOCATE (list, double, NLIST);
    566566
    … …  
    569569
    570570  /* look for measures */
    571   for (i = 0; i < average[0].Nm; i++) {
     571  for (i = 0; i < average[0].Nmeasure; i++) {
    572572    TESTCODE (code, measure[i]);  /* skip measurements not matching photcode */
    573573    TESTMEASURE (measure[i]);     /* exclusions based on measure.params  */
    … …  
    633633
    634634    case AVE_NMEAS:
    635       value = average[0].Nm;
     635      value = average[0].Nmeasure;
    636636      break;
    637637    case AVE_NMISS:
    638       value = average[0].Nn;
     638      value = average[0].Nmissing;
    639639      break;
    640640    case AVE_Xp:
    … …  
    658658        case MAG_CAL:
    659659          value = NAN;
    660           for (i = 0; i < average[0].Nm; i++) {
     660          for (i = 0; i < average[0].Nmeasure; i++) {
    661661              if (code[0].code != measure[i].photcode) continue;
    662662              value = measure[i].M;
    … …  
    679679    case AVE_NCODE:
    680680      value = 0;
    681       for (i = 0; i < average[0].Nm; i++) {
     681      for (i = 0; i < average[0].Nmeasure; i++) {
    682682        if (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
    683683        value ++;
    … …  
    686686    case AVE_NPHOT:
    687687      value = 0;
    688       for (i = 0; i < average[0].Nm; i++) {
     688      for (i = 0; i < average[0].Nmeasure; i++) {
    689689        if (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode)) continue;
    690690        if (measure[i].dbFlags & (ID_MEAS_POOR | ID_MEAS_SKIP)) continue;
    … …  
    695695    case AVE_NCRIT:
    696696      value = 0;
    697       for (i = 0; i < average[0].Nm; i++) {
     697      for (i = 0; i < average[0].Nmeasure; i++) {
    698698        if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[i].photcode))) continue;
    699699        if (ErrSelect && (measure[i].dM > ErrValue)) continue;
    … …  
    716716 
    717717  Nt = Nc = 0;
    718   for (k = 0; k < average[0].Nm; k++) {
     718  for (k = 0; k < average[0].Nmeasure; k++) {
    719719    if ((code != NULL) && (code[0].code != GetPhotcodeEquivCodebyCode (measure[k].photcode))) continue;
    720720    Nc ++;
    … …  
    732732 
    733733  Nt[0] = Nt[1] = Nt[2] = 0;
    734   for (k = 0; k < average[0].Nm; k++) {
     734  for (k = 0; k < average[0].Nmeasure; k++) {
    735735    if (code != GetPhotcodeEquivCodebyCode (measure[k].photcode)) continue;
    736736    N = GetMeasureTypeCode (&measure[k]);
    … …  
    793793  if ((code != NULL) && (code[0].type == PHOT_REF)) {
    794794    Nm = 0;
    795     for (i = 0; i < average[0].Nm; i++) {
     795    for (i = 0; i < average[0].Nmeasure; i++) {
    796796      TESTCODE (code, measure[i]);
    797797      Nm++;
    … …  
    805805  if (FWHMSelect) {
    806806    Nm = 0;
    807     for (i = 0; i < average[0].Nm; i++) {
     807    for (i = 0; i < average[0].Nmeasure; i++) {
    808808      fwhm = measure[i].FWx / 100.0;
    809809      switch (FWHMsign) {
    … …  
    820820      Nm++;
    821821    }
    822     if (average[0].Nm * FWHMfrac > Nm) return (FALSE);
     822    if (average[0].Nmeasure * FWHMfrac > Nm) return (FALSE);
    823823  }
    824824
    … …  
    833833  if (NcodeSelect) {
    834834    Nm = 0;
    835     for (i = 0; i < average[0].Nm; i++) {
     835    for (i = 0; i < average[0].Nmeasure; i++) {
    836836      TESTCODE (code, measure[i]);
    837837      Nm++;
    … …  
    872872  if (NphotSelect) {
    873873    Nm = 0;
    874     for (i = 0; i < average[0].Nm; i++) {
     874    for (i = 0; i < average[0].Nmeasure; i++) {
    875875      TESTCODE (code, measure[i]);
    876876      if (measure[i].dbFlags && ID_MEAS_SKIP) continue;
    … …  
    931931   Ns    - secfilt entry (-1 for PRI)
    932932   &catalog.average[i],
    933    &catalog.measure[catalog.average[i].offset],
     933   &catalog.measure[catalog.average[i].measureOffset],
    934934   &catalog.secfilt[i*Nsec]
    935935*/
    … …  
    974974  *nlist = 0;
    975975  Nlist = 0;
    976   NLIST = MAX (1, average[0].Nm*average[0].Nm);
     976  NLIST = MAX (1, average[0].Nmeasure*average[0].Nmeasure);
    977977  ALLOCATE (list, double, NLIST);
    978978  M1 = M2 = NULL;
    … …  
    10151015  *nlist = 0;
    10161016  Nlist = 0;
    1017   NLIST = MAX (1, average[0].Nm*average[0].Nm);
     1017  NLIST = MAX (1, average[0].Nmeasure*average[0].Nmeasure);
    10181018  ALLOCATE (list, double, NLIST);
    10191019
    … …  
    10311031
    10321032  /* loop twice over all measures */
    1033   for (i = 0; i < average[0].Nm; i++) {
     1033  for (i = 0; i < average[0].Nmeasure; i++) {
    10341034    SetSelectionParam (Np0);
    10351035    TESTCODE (code[0], measure[i]);
    10361036    TESTMEASURE (measure[i]);
    10371037    SETMAG(M1, measure[i], mode[0]);
    1038     for (j = 0; j < average[0].Nm; j++) {
     1038    for (j = 0; j < average[0].Nmeasure; j++) {
    10391039      if (i == j) continue;
    10401040      SetSelectionParam (Np1);
    … …  
    10861086  *nlist = 0;
    10871087  Nlist = 0;
    1088   NLIST = MAX (1, average[0].Nm*average[0].Nm);
     1088  NLIST = MAX (1, average[0].Nmeasure*average[0].Nmeasure);
    10891089  ALLOCATE (list, double, NLIST);
    10901090
    … …  
    10991099
    11001100  /* loop twice over all measures */
    1101   for (i = 0; i < average[0].Nm; i++) {
     1101  for (i = 0; i < average[0].Nmeasure; i++) {
    11021102    TESTCODE (code[0], measure[i]);
    11031103    TESTMEASURE (measure[i]);
    11041104    SETMAG(M1, measure[i], mode[0]);
    1105     for (j = 0; j < average[0].Nm; j++) {
     1105    for (j = 0; j < average[0].Nmeasure; j++) {
    11061106      if (i == j) continue;
    11071107      TESTCODE (code[1], measure[j]);

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

    r15038 r16810  
    111111      while (catalog.average[i].R < Rmin) catalog.average[i].R += 360.0;
    112112      while (catalog.average[i].R > Rmax) catalog.average[i].R -= 360.0;
    113       m = catalog.average[i].offset;
    114       for (k = 0; k < catalog.average[i].Nm; k++) {
     113      m = catalog.average[i].measureOffset;
     114      for (k = 0; k < catalog.average[i].Nmeasure; k++) {
    115115        if (FlagClip) {
    116116          flags = catalog.measure[m+k].dbFlags;

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

    r16040 r16810  
    130130
    131131  /* only print the entries for existing measurements of this star */
    132   measure = &catalog.measure[catalog.average[Nentry].offset];
    133   Nmeasure = catalog.average[Nentry].Nm;
     132  measure = &catalog.measure[catalog.average[Nentry].measureOffset];
     133  Nmeasure = catalog.average[Nentry].Nmeasure;
    134134  for (i = 0; i < Nsub; i++) {
    135135    I = index[i];

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

    r16004 r16810  
    7272      MEAS_IMAGE_ID,
    7373      MEAS_PSF_QF,
    74       MEAS_PSF_PROB,
     74      MEAS_PSF_CHISQ,
    7575      MEAS_CR_NSIGMA,
    7676      MEAS_EXT_NSIGMA,

  • trunk/Ohana/src/opihi/pantasks/ipptool2book.c

    r16567 r16810  
    108108    FREEKEYS;
    109109    return FALSE;
    110   }
    111   if (strcmp(bookName, argv[2])) {
    112     gprint (GP_ERR, "WARNING: metadata output name %s does not match expected bookname %s\n", bookName, argv[2]);
    113110  }
    114111  free (line);
Note: See TracChangeset for help on using the changeset viewer.