IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 42692


Ignore:
Timestamp:
Jun 24, 2024, 8:56:30 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/libdvo
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20230313/Ohana/src/libdvo/include/dvodb.h

    r42389 r42692  
    547547
    548548dbValue      dbExtractAverages      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensobj *lensobj, StarPar *starpar, GalPhot *galphot, dbField *field));
    549 dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Measure *measure, Lensing *lensing, StarPar *starpar, dbField *field));
     549dbValue      dbExtractMeasures      PROTO((Average *average, SecFilt *secfilt, Lensobj *lensobj, Measure *measure, Lensing *lensing, StarPar *starpar, GalPhot *galphot, dbField *field));
    550550dbValue      dbExtractImages        PROTO((Image *image, off_t Nimage, off_t N, dbField *field));
    551551

  • branches/eam_branches/ipp-20230313/Ohana/src/libdvo/src/dbExtractMeasures.c

    r42102 r42692  
    8585
    8686/* return measure.field based on the selection */
    87 dbValue dbExtractMeasures (Average *average, SecFilt *secfilt, Measure *measure, Lensing *lensing, StarPar *starpar, dbField *field) {
     87dbValue dbExtractMeasures (Average *average, SecFilt *secfilt, Lensobj *lensobj, Measure *measure, Lensing *lensing, StarPar *starpar, GalPhot *galphot, dbField *field) {
    8888
    8989  int Nsec;
    … …  
    264264         
    265265          // the following values come from the mean lensobj table
    266         case MAG_OPTION_X11_SM_OBJ:
    267         case MAG_OPTION_X12_SM_OBJ:
    268         case MAG_OPTION_X22_SM_OBJ:
    269         case MAG_OPTION_E1_SM_OBJ:
    270         case MAG_OPTION_E2_SM_OBJ:
    271         case MAG_OPTION_X11_SH_OBJ:
    272         case MAG_OPTION_X12_SH_OBJ:
    273         case MAG_OPTION_X22_SH_OBJ:
    274         case MAG_OPTION_E1_SH_OBJ:
    275         case MAG_OPTION_E2_SH_OBJ:
    276         case MAG_OPTION_X11_SM_PSF:
    277         case MAG_OPTION_X12_SM_PSF:
    278         case MAG_OPTION_X22_SM_PSF:
    279         case MAG_OPTION_E1_SM_PSF:
    280         case MAG_OPTION_E2_SM_PSF:
    281         case MAG_OPTION_X11_SH_PSF:
    282         case MAG_OPTION_X12_SH_PSF:
    283         case MAG_OPTION_X22_SH_PSF:
    284         case MAG_OPTION_E1_SH_PSF:
    285         case MAG_OPTION_E2_SH_PSF:
    286 
    287         case MAG_OPTION_E1_PSF:
    288         case MAG_OPTION_E2_PSF:
    289 
    290         case MAG_OPTION_F_AP_R5:
    291         case MAG_OPTION_F_ERR_AP_R5:
    292         case MAG_OPTION_F_STDEV_AP_R5:
    293         case MAG_OPTION_F_FILL_AP_R5:
    294         case MAG_OPTION_F_AP_R6:
    295         case MAG_OPTION_F_ERR_AP_R6:
    296         case MAG_OPTION_F_STDEV_AP_R6:
    297         case MAG_OPTION_F_FILL_AP_R6:
    298         case MAG_OPTION_F_AP_R7:
    299         case MAG_OPTION_F_ERR_AP_R7:
    300         case MAG_OPTION_F_STDEV_AP_R7:
    301         case MAG_OPTION_F_FILL_AP_R7:
    302         case MAG_OPTION_E1:
    303         case MAG_OPTION_E2:
    304 
    305         case MAG_OPTION_GAL_MAG:       
    306         case MAG_OPTION_GAL_MAG_ERR:   
    307         case MAG_OPTION_GAL_MAJ:       
    308         case MAG_OPTION_GAL_MAJ_ERR:   
    309         case MAG_OPTION_GAL_MIN:       
    310         case MAG_OPTION_GAL_MIN_ERR:   
    311         case MAG_OPTION_GAL_THETA:     
    312         case MAG_OPTION_GAL_THETA_ERR:
    313         case MAG_OPTION_GAL_INDEX:     
    314         case MAG_OPTION_GAL_CHISQ:     
    315         case MAG_OPTION_GAL_NPIX:     
    316         case MAG_OPTION_GAL_FLAGS:     
    317         case MAG_OPTION_GAL_TYPE:     
    318         case MAG_OPTION_GAL_OBJ_ID:
    319         case MAG_OPTION_GAL_CAT_ID:
    320         case MAG_OPTION_GAL_DET_ID:
    321         case MAG_OPTION_GAL_IMAGE_ID:
    322 
    323         case MAG_OPTION_NONE:
    324           break;
     266          // g:X11_SM_OBJ, etc, are only valid for average
     267        case MAG_OPTION_X11_SM_OBJ: { value.Flt = LensValue_X11_sm_obj (field->photcode, lensobj, average->Nlensobj); break; }
     268        case MAG_OPTION_X12_SM_OBJ: { value.Flt = LensValue_X12_sm_obj (field->photcode, lensobj, average->Nlensobj); break; }
     269        case MAG_OPTION_X22_SM_OBJ: { value.Flt = LensValue_X22_sm_obj (field->photcode, lensobj, average->Nlensobj); break; }
     270        case MAG_OPTION_E1_SM_OBJ:  { value.Flt = LensValue_E1_sm_obj  (field->photcode, lensobj, average->Nlensobj); break; }
     271        case MAG_OPTION_E2_SM_OBJ:  { value.Flt = LensValue_E2_sm_obj  (field->photcode, lensobj, average->Nlensobj); break; }
     272
     273        case MAG_OPTION_X11_SH_OBJ: { value.Flt = LensValue_X11_sh_obj (field->photcode, lensobj, average->Nlensobj); break; }
     274        case MAG_OPTION_X12_SH_OBJ: { value.Flt = LensValue_X12_sh_obj (field->photcode, lensobj, average->Nlensobj); break; }
     275        case MAG_OPTION_X22_SH_OBJ: { value.Flt = LensValue_X22_sh_obj (field->photcode, lensobj, average->Nlensobj); break; }
     276        case MAG_OPTION_E1_SH_OBJ:  { value.Flt = LensValue_E1_sh_obj  (field->photcode, lensobj, average->Nlensobj); break; }
     277        case MAG_OPTION_E2_SH_OBJ:  { value.Flt = LensValue_E2_sh_obj  (field->photcode, lensobj, average->Nlensobj); break; }
     278
     279        case MAG_OPTION_X11_SM_PSF: { value.Flt = LensValue_X11_sm_psf (field->photcode, lensobj, average->Nlensobj); break; }
     280        case MAG_OPTION_X12_SM_PSF: { value.Flt = LensValue_X12_sm_psf (field->photcode, lensobj, average->Nlensobj); break; }
     281        case MAG_OPTION_X22_SM_PSF: { value.Flt = LensValue_X22_sm_psf (field->photcode, lensobj, average->Nlensobj); break; }
     282        case MAG_OPTION_E1_SM_PSF:  { value.Flt = LensValue_E1_sm_psf  (field->photcode, lensobj, average->Nlensobj); break; }
     283        case MAG_OPTION_E2_SM_PSF:  { value.Flt = LensValue_E2_sm_psf  (field->photcode, lensobj, average->Nlensobj); break; }
     284
     285        case MAG_OPTION_X11_SH_PSF: { value.Flt = LensValue_X11_sh_psf (field->photcode, lensobj, average->Nlensobj); break; }
     286        case MAG_OPTION_X12_SH_PSF: { value.Flt = LensValue_X12_sh_psf (field->photcode, lensobj, average->Nlensobj); break; }
     287        case MAG_OPTION_X22_SH_PSF: { value.Flt = LensValue_X22_sh_psf (field->photcode, lensobj, average->Nlensobj); break; }
     288        case MAG_OPTION_E1_SH_PSF:  { value.Flt = LensValue_E1_sh_psf  (field->photcode, lensobj, average->Nlensobj); break; }
     289        case MAG_OPTION_E2_SH_PSF:  { value.Flt = LensValue_E2_sh_psf  (field->photcode, lensobj, average->Nlensobj); break; }
     290
     291        case MAG_OPTION_F_AP_R5:       { value.Flt = LensValue_F_ApR5  (field->photcode, lensobj, average->Nlensobj); break; }
     292        case MAG_OPTION_F_ERR_AP_R5:   { value.Flt = LensValue_dF_ApR5 (field->photcode, lensobj, average->Nlensobj); break; }
     293        case MAG_OPTION_F_STDEV_AP_R5: { value.Flt = LensValue_sF_ApR5 (field->photcode, lensobj, average->Nlensobj); break; }
     294        case MAG_OPTION_F_FILL_AP_R5:  { value.Flt = LensValue_fF_ApR5 (field->photcode, lensobj, average->Nlensobj); break; }
     295                                                                                               
     296        case MAG_OPTION_F_AP_R6:       { value.Flt = LensValue_F_ApR6  (field->photcode, lensobj, average->Nlensobj); break; }
     297        case MAG_OPTION_F_ERR_AP_R6:   { value.Flt = LensValue_dF_ApR6 (field->photcode, lensobj, average->Nlensobj); break; }
     298        case MAG_OPTION_F_STDEV_AP_R6: { value.Flt = LensValue_sF_ApR6 (field->photcode, lensobj, average->Nlensobj); break; }
     299        case MAG_OPTION_F_FILL_AP_R6:  { value.Flt = LensValue_fF_ApR6 (field->photcode, lensobj, average->Nlensobj); break; }
     300
     301        case MAG_OPTION_F_AP_R7:       { value.Flt = LensValue_F_ApR7  (field->photcode, lensobj, average->Nlensobj); break; }
     302        case MAG_OPTION_F_ERR_AP_R7:   { value.Flt = LensValue_dF_ApR7 (field->photcode, lensobj, average->Nlensobj); break; }
     303        case MAG_OPTION_F_STDEV_AP_R7: { value.Flt = LensValue_sF_ApR7 (field->photcode, lensobj, average->Nlensobj); break; }
     304        case MAG_OPTION_F_FILL_AP_R7:  { value.Flt = LensValue_fF_ApR7 (field->photcode, lensobj, average->Nlensobj); break; }
     305
     306        case MAG_OPTION_E1:            { value.Flt = LensValue_E1      (field->photcode, lensobj, average->Nlensobj); break; }
     307        case MAG_OPTION_E2:            { value.Flt = LensValue_E2      (field->photcode, lensobj, average->Nlensobj); break; }
     308
     309        case MAG_OPTION_GAL_MAG:      { value.Flt = GalphotValue_GAL_MAG      (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     310        case MAG_OPTION_GAL_MAG_ERR:  { value.Flt = GalphotValue_GAL_MAG_ERR  (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     311        case MAG_OPTION_GAL_MAJ:      { value.Flt = GalphotValue_GAL_MAJ      (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     312        case MAG_OPTION_GAL_MAJ_ERR:  { value.Flt = GalphotValue_GAL_MAJ_ERR  (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     313        case MAG_OPTION_GAL_MIN:      { value.Flt = GalphotValue_GAL_MIN      (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     314        case MAG_OPTION_GAL_MIN_ERR:  { value.Flt = GalphotValue_GAL_MIN_ERR  (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     315        case MAG_OPTION_GAL_THETA:    { value.Flt = GalphotValue_GAL_THETA    (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     316        case MAG_OPTION_GAL_THETA_ERR:{ value.Flt = GalphotValue_GAL_THETA_ERR(field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     317        case MAG_OPTION_GAL_INDEX:    { value.Flt = GalphotValue_GAL_INDEX    (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     318        case MAG_OPTION_GAL_CHISQ:    { value.Flt = GalphotValue_GAL_CHISQ    (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     319        case MAG_OPTION_GAL_NPIX:     { value.Flt = GalphotValue_GAL_NPIX     (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     320        case MAG_OPTION_GAL_TYPE:     { value.Flt = GalphotValue_GAL_TYPE     (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     321        case MAG_OPTION_GAL_FLAGS:    { value.Flt = GalphotValue_GAL_FLAGS    (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     322
     323        case MAG_OPTION_GAL_OBJ_ID:   { value.Flt = GalphotValue_GAL_OBJ_ID   (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     324        case MAG_OPTION_GAL_CAT_ID:   { value.Flt = GalphotValue_GAL_CAT_ID   (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     325        case MAG_OPTION_GAL_DET_ID:   { value.Flt = GalphotValue_GAL_DET_ID   (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     326        case MAG_OPTION_GAL_IMAGE_ID: { value.Flt = GalphotValue_GAL_IMAGE_ID (field->photcode, field->magClass, galphot, average->Ngalphot); break; }
     327
     328        case MAG_OPTION_E1_PSF: break;
     329        case MAG_OPTION_E2_PSF: break;
     330        case MAG_OPTION_NONE: break;
    325331      }
    326332      break;
Note: See TracChangeset for help on using the changeset viewer.