IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 42693


Ignore:
Timestamp:
Jun 24, 2024, 8:57:19 AM (2 years ago)
Author:
eugene
Message:

allow mextract to retrieve values from the lensobj and galphot tables

Location:
branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/avperiodogram.c

    r40574 r42693  
    274274        // The first 3 values[] / fields[] will be time, mag, dmag
    275275        for (off_t n = 0; n < Nmfields; n++) {
    276           mvalues[n] = dbExtractMeasures (average, secfilt, &measure[k], NULL, NULL, &mfields[n]);
     276          mvalues[n] = dbExtractMeasures (average, secfilt, NULL, &measure[k], NULL, NULL, NULL, &mfields[n]);
    277277        }
    278278        if (!dbBooleanCond (mstack, Nmstack, mvalues)) continue;

  • branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/avperiodomatch.c

    r41379 r42693  
    302302        // The first 3 values[] / fields[] will be time, mag, dmag
    303303        for (off_t n = 0; n < Nmfields; n++) {
    304           mvalues[n] = dbExtractMeasures (average, secfilt, &measure[k], NULL, NULL, &mfields[n]);
     304          mvalues[n] = dbExtractMeasures (average, secfilt, NULL, &measure[k], NULL, NULL, NULL, &mfields[n]);
    305305        }
    306306        if (!dbBooleanCond (mstack, Nmstack, mvalues)) continue;

  • branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/gstar.c

    r41427 r42693  
    401401          gprint (GP_LOG, "%20s ",     date);
    402402          gprint (GP_LOG, "%f   ",     catalog.average[k].Trange / 86400.0);
     403
     404          gprint (GP_LOG, "%ld ", catalog.average[k].extID);
     405          // gprint (GP_LOG, "0x%16x ", catalog.average[k].extID);
    403406        }
    404407

  • branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/mextract.c

    r42103 r42693  
    221221  }
    222222
     223  int needLensobj = dbFieldNeedLensobj (fields, Nfields);
    223224  int needLensing = dbFieldNeedLensing (fields, Nfields);
    224225  int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
     226  int needGalphot = dbFieldNeedGalphot (fields, Nfields);
    225227
    226228  // the lensing table does not have a good index to/from the measure table.  if we need lensing
    … …  
    247249    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
    248250    catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
     251    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
    249252    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     253    catalog.catflags |= needGalphot ? DVO_LOAD_GALPHOT : DVO_SKIP_GALPHOT;
    250254    catalog.Nsecfilt = Nsecfilt;
    251255
    … …  
    297301        dbExtractMeasuresInitMeas (); // reset counters for saved fields  (costs very little
    298302
    299         int Nstarpar = average->starparOffset;
    300         StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[Nstarpar] : NULL;
     303        int nStar = average->starparOffset;
     304        StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[nStar] : NULL;
     305
     306        int nLens = average->lensobjOffset;
     307        Lensobj *lensobj = needLensobj && average->Nlensobj ? &catalog.lensobj[nLens] : NULL;
     308
     309        int nPhot = average->galphotOffset;
     310        GalPhot *galphot = needGalphot && average->Ngalphot ? &catalog.galphot[nPhot] : NULL;
    301311
    302312        Lensing *lensing = NULL;
    … …  
    313323
    314324        for (n = 0; n < Nfields; n++) {
    315           values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], lensing, starpar, &fields[n]);
     325          values[n] = dbExtractMeasures (average, secfilt, lensobj, &catalog.measure[m], lensing, starpar, galphot, &fields[n]);
    316326        }
    317327        // fprintf (stderr, "object: ave: %f, cat: %f, averef %d\n", fields[n].name, values[2], values[3], catalog.measure[m].averef);

  • branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/mmatch.c

    r41341 r42693  
    232232  ALLOCATE (index, off_t, Nelem);
    233233
    234   // int needLensing = dbFieldNeedLensing (fields, Nfields);
     234  int needLensobj = dbFieldNeedLensobj (fields, Nfields);
     235//int needLensing = dbFieldNeedLensing (fields, Nfields);
    235236  int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
     237  int needGalphot = dbFieldNeedGalphot (fields, Nfields);
    236238
    237239  // grab data from all selected sky regions
    … …  
    249251    catalog.filename = HOST_ID ? hostfile : skylist[0].filename[i];
    250252    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_SECFILT | DVO_LOAD_MEASURE;
     253    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
    251254    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     255    catalog.catflags |= needGalphot ? DVO_LOAD_GALPHOT : DVO_SKIP_GALPHOT;
    252256    catalog.Nsecfilt = Nsecfilt;
    253257
    … …  
    289293        Average *average = &catalog.average[Ncat];
    290294
    291         int Nstarpar = average->starparOffset;
    292         StarPar *starpar = needStarpar ? &catalog.starpar[Nstarpar] : NULL;
     295        int nStar = average->starparOffset;
     296        StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[nStar] : NULL;
     297
     298        int nLens = average->lensobjOffset;
     299        Lensobj *lensobj = needLensobj && average->Nlensobj ? &catalog.lensobj[nLens] : NULL;
     300
     301        int nPhot = average->galphotOffset;
     302        GalPhot *galphot = needGalphot && average->Ngalphot ? &catalog.galphot[nPhot] : NULL;
    293303
    294304        // int Nlensing = average->lensobjOffset;
    … …  
    299309
    300310        for (n = 0; n < Nfields; n++) {
    301           values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], NULL, starpar, &fields[n]);
     311          values[n] = dbExtractMeasures (average, secfilt, lensobj, &catalog.measure[m], NULL, starpar, galphot, &fields[n]);
    302312        }
    303313

  • branches/eam_branches/ipp-20230313/Ohana/src/opihi/dvo/mmextract.c

    r39457 r42693  
    174174  }
    175175
    176   // int needLensing = dbFieldNeedLensing (fields, Nfields);
     176  int needLensobj = dbFieldNeedLensobj (fields, Nfields);
     177//int needLensing = dbFieldNeedLensing (fields, Nfields);
    177178  int needStarpar = dbFieldNeedStarpar (fields, Nfields, FALSE);
     179  int needGalphot = dbFieldNeedGalphot (fields, Nfields);
    178180
    179181  // grab data from all selected sky regions
    … …  
    185187    catalog.filename = skylist[0].filename[i];
    186188    catalog.catflags = DVO_LOAD_AVERAGE | DVO_LOAD_MEASURE | DVO_LOAD_SECFILT;
     189//  catalog.catflags |= needLensing ? DVO_LOAD_LENSING : DVO_SKIP_LENSING;
     190    catalog.catflags |= needLensobj ? DVO_LOAD_LENSOBJ : DVO_SKIP_LENSOBJ;
     191    catalog.catflags |= needStarpar ? DVO_LOAD_STARPAR : DVO_SKIP_STARPAR;
     192    catalog.catflags |= needGalphot ? DVO_LOAD_GALPHOT : DVO_SKIP_GALPHOT;
    187193    catalog.Nsecfilt = Nsecfilt;
    188194
    … …  
    220226        Average *average = &catalog.average[j];
    221227
    222         int Nstarpar = average->starparOffset;
    223         StarPar *starpar = needStarpar ? &catalog.starpar[Nstarpar] : NULL;
     228        int nStar = average->starparOffset;
     229        StarPar *starpar = needStarpar && average->Nstarpar ? &catalog.starpar[nStar] : NULL;
     230
     231        int nLens = average->lensobjOffset;
     232        Lensobj *lensobj = needLensobj && average->Nlensobj ? &catalog.lensobj[nLens] : NULL;
     233
     234        int nPhot = average->galphotOffset;
     235        GalPhot *galphot = needGalphot && average->Ngalphot ? &catalog.galphot[nPhot] : NULL;
    224236
    225237        // int Nlensing = average->lensobjOffset;
    … …  
    231243        for (n = 0; n < Nfields; n++) {
    232244          // values needs to be a pointer to a type with FLT and INT (with a union, we would save a bit of memory...)
    233           values[n] = dbExtractMeasures (average, secfilt, &catalog.measure[m], NULL, starpar, &fields[n]);
     245          values[n] = dbExtractMeasures (average, secfilt, lensobj, &catalog.measure[m], NULL, starpar, galphot, &fields[n]);
    234246        }
    235247        // fprintf (stderr, "object: ave: %f, cat: %f, averef %d\n", fields[n].name, values[2], values[3], catalog.measure[m].averef);
Note: See TracChangeset for help on using the changeset viewer.