IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38601 for trunk


Ignore:
Timestamp:
Jul 18, 2015, 12:40:32 PM (11 years ago)
Author:
eugene
Message:

adding galphot fields to avextract; Ohana builds, but avextract does not yet return the galphot values

Location:
trunk/Ohana/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Ohana/src/libautocode/def/average.d

    r38441 r38601  
    4141FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
    4242FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
    43 FIELD Ngalphot,      NGALPHOT,   unsigned short,  number of galphot measurements
     43FIELD Ngalphot,       NGALPHOT,    unsigned short,  number of galphot measurements
    4444
    4545FIELD measureOffset,  OFF_MEASURE,  int,             offset to first psf measurement
    … …  
    4848FIELD lensobjOffset,  OFF_LENSOBJ,  int,            offset to mean lensing data
    4949FIELD starparOffset,  OFF_STARPAR,  int,            offset to stellar parameter data
    50 FIELD galphotOffset, OFF_GALPHOT, int,              offset to extended object entry
     50FIELD galphotOffset,  OFF_GALPHOT, int,            offset to extended object entry
    5151
    5252FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars

  • trunk/Ohana/src/libdvo/include/dvodb.h

    r38600 r38601  
    315315      AVE_GAL_CHISQ,
    316316      AVE_GAL_NPIX,
    317       AVE_GAL_TYPE,
     317      AVE_GAL_TYPE,       
    318318      AVE_E_BV,               // extinction (mags)
    319319      AVE_E_BV_ERR,
    … …  
    495495int          ParseImageField        PROTO((dbField *field, char *fieldName));
    496496
    497 dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, dbField *field));
     497dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, GalPhot *galphot, dbField *field));
    498498dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensing *lensing, StarPar *starpar, dbField *field));
    499499dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
    … …  
    508508int dbFieldNeedLensing (dbField *fields, int Nfields);
    509509int dbFieldNeedStarpar (dbField *fields, int Nfields, int isAverage);
     510int dbFieldNeedGalphot (dbField *fields, int Nfields);
    510511
    511512void FreeImageSelection (void);

  • trunk/Ohana/src/libdvo/src/dbExtractAverages.c

    r38153 r38601  
    5050
    5151/* return average.field based on the selection */
    52 dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, dbField *field) {
     52dbValue dbExtractAverages (Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, GalPhot *galphot, dbField *field) {
    5353
    5454  // off_t i;
    … …  
    413413      break;
    414414
     415      // this section assumes a 1-to-1 match between average and starpar
    415416    case AVE_E_BV:             { value.Flt = starpar->Ebv;      break; }
    416417    case AVE_E_BV_ERR:         { value.Flt = starpar->dEbv;     break; }
    … …  
    426427    case AVE_DEC_GALMODEL:     { value.Flt = starpar->D;        break; }
    427428
     429    case AVE_GAL_MAG:          { value.Flt = NAN;               break; }
     430    case AVE_GAL_MAG_ERR:      { value.Flt = NAN;               break; }
     431    case AVE_GAL_MAJ:          { value.Flt = NAN;               break; }
     432    case AVE_GAL_MAJ_ERR:      { value.Flt = NAN;               break; }
     433    case AVE_GAL_MIN:          { value.Flt = NAN;               break; }
     434    case AVE_GAL_MIN_ERR:      { value.Flt = NAN;               break; }
     435    case AVE_GAL_THETA:        { value.Flt = NAN;               break; }
     436    case AVE_GAL_THETA_ERR:    { value.Flt = NAN;               break; }
     437    case AVE_GAL_INDEX:        { value.Flt = NAN;               break; }
     438    case AVE_GAL_CHISQ:        { value.Flt = NAN;               break; }
     439    case AVE_GAL_NPIX:         { value.Flt = NAN;               break; }
     440    case AVE_GAL_TYPE:         { value.Flt = NAN;               break; }
     441
    428442    case AVE_TYPE:
    429443      break;

  • trunk/Ohana/src/libdvo/src/dbFields.c

    r38600 r38601  
    161161}
    162162
    163 int dbFieldNeedStarpar (dbField *fields, int Nfields, int isAverage) {
     163int dbFieldNeedGalphot (dbField *fields, int Nfields) {
    164164  int i;
    165165  for (i = 0; i < Nfields; i++) {
    166     if (isAverage) {
    167       if (fields[i].ID == AVE_E_BV)             return TRUE;
    168       if (fields[i].ID == AVE_E_BV_ERR)         return TRUE;
    169       if (fields[i].ID == AVE_DISTANCE_MOD)     return TRUE;
    170       if (fields[i].ID == AVE_DISTANCE_MOD_ERR) return TRUE;
    171       if (fields[i].ID == AVE_M_R)              return TRUE;
    172       if (fields[i].ID == AVE_M_R_ERR)          return TRUE;
    173       if (fields[i].ID == AVE_FEH)              return TRUE;
    174       if (fields[i].ID == AVE_FEH_ERR)          return TRUE;
    175       if (fields[i].ID == AVE_URA_GALMODEL)     return TRUE;
    176       if (fields[i].ID == AVE_UDEC_GALMODEL)    return TRUE;
    177       if (fields[i].ID == AVE_RA_GALMODEL)      return TRUE;
    178       if (fields[i].ID == AVE_DEC_GALMODEL)     return TRUE;
    179     }
    180   }
     166    if (fields[i].ID == AVE_GAL_MAG         ) return TRUE;
     167    if (fields[i].ID == AVE_GAL_MAG_ERR     ) return TRUE;
     168    if (fields[i].ID == AVE_GAL_MAJ         ) return TRUE;
     169    if (fields[i].ID == AVE_GAL_MAJ_ERR     ) return TRUE;
     170    if (fields[i].ID == AVE_GAL_MIN         ) return TRUE;
     171    if (fields[i].ID == AVE_GAL_MIN_ERR     ) return TRUE;
     172    if (fields[i].ID == AVE_GAL_THETA       ) return TRUE;
     173    if (fields[i].ID == AVE_GAL_THETA_ERR   ) return TRUE;
     174    if (fields[i].ID == AVE_GAL_INDEX       ) return TRUE;
     175    if (fields[i].ID == AVE_GAL_CHISQ       ) return TRUE;
     176    if (fields[i].ID == AVE_GAL_NPIX        ) return TRUE;
     177    if (fields[i].ID == AVE_GAL_TYPE        ) return TRUE;
     178  }
     179  return FALSE;
    181180}
    182181

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

    r38600 r38601  
    167167  int needLensobj = dbFieldNeedLensobj (fields, Nfields);
    168168  int needStarpar = dbFieldNeedStarpar (fields, Nfields, TRUE);
    169   int needGalphot = dbFieldNeedGalphot (fields, Nfields, TRUE);
     169  int needGalphot = dbFieldNeedGalphot (fields, Nfields);
    170170
    171171  // grab data from all selected sky regions
    … …  
    192192    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
    193193    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     194    catalog.catflags |= needGalphot ? DVO_LOAD_GALPHOT : DVO_SKIP_GALPHOT;
    194195    catalog.Nsecfilt = 0;
    195196
    … …  
    220221      StarPar *starpar = needStarpar ? &catalog.starpar[m] : NULL;
    221222
     223      m = average->galphotOffset;
     224      GalPhot *galphot = needGalphot ? &catalog.galphot[m] : NULL;
     225
    222226      m = j*Nsecfilt;
    223227      SecFilt *secfilt = &catalog.secfilt[m];
    … …  
    225229      for (n = 0; n < Nfields; n++) {
    226230        // we are passing in the *first* measure, but average->Nmeasure gives the count
    227         values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, &fields[n]);
     231        values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, galphot, &fields[n]);
    228232      }
    229233

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

    r38471 r38601  
    238238      dbExtractAveragesInitAve ();
    239239      for (n = 0; n < Nfields; n++) {
    240         values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, &fields[n]);
     240        values[n] = dbExtractAverages (average, secfilt, measure, lensobj, starpar, NULL, &fields[n]);
    241241      }
    242242

  • trunk/Ohana/src/relastro/src/high_speed_utils.c

    r37807 r38601  
    141141    off_t n;
    142142    for (n = 0; n < NfieldsA; n++) {
    143       valuesA[n] = dbExtractAverages (&catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], &catalog[0].measure[m], NULL, NULL, &fieldsA[n]);
     143      valuesA[n] = dbExtractAverages (&catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], &catalog[0].measure[m], NULL, NULL, NULL, &fieldsA[n]);
    144144    }
    145145    return dbBooleanCond(stackA, NstackA, valuesA);
    … …  
    155155    off_t n;
    156156    for (n = 0; n < NfieldsB; n++) {
    157         valuesB[n] = dbExtractAverages (&catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], &catalog[0].measure[m], NULL, NULL, &fieldsB[n]);
     157      valuesB[n] = dbExtractAverages (&catalog[0].average[i], &catalog[0].secfilt[i*Nsecfilt], &catalog[0].measure[m], NULL, NULL, NULL, &fieldsB[n]);
    158158    }
    159159    return dbBooleanCond(stackB, NstackB, valuesB);
Note: See TracChangeset for help on using the changeset viewer.