IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 39568


Ignore:
Timestamp:
May 9, 2016, 9:11:33 AM (10 years ago)
Author:
eugene
Message:

adding methods to extract lensing parameters

Location:
trunk/Ohana/src/libdvo
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r39531 r39568  
    8383  MAG_OPTION_E1_SH_PSF,
    8484  MAG_OPTION_E2_SH_PSF,
     85
     86  MAG_OPTION_E1_PSF,
     87  MAG_OPTION_E2_PSF,
    8588
    8689  MAG_OPTION_F_AP_R5,
    … …  
    258261      MEAS_E2_SH_PSF,
    259262
     263      MEAS_E1_PSF,
     264      MEAS_E2_PSF,
     265
    260266      MEAS_F_AP_R5,
    261267      MEAS_F_ERR_AP_R5,

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

    r39531 r39568  
    276276        case MAG_OPTION_E1_SH_PSF:
    277277        case MAG_OPTION_E2_SH_PSF:
     278
     279        case MAG_OPTION_E1_PSF:
     280        case MAG_OPTION_E2_PSF:
     281
    278282        case MAG_OPTION_F_AP_R5:
    279283        case MAG_OPTION_F_ERR_AP_R5:
    … …  
    749753      break;
    750754
    751     case MEAS_X11_SM_OBJ: { value.Flt = lensing->X11_sm_obj; break; }
    752     case MEAS_X12_SM_OBJ: { value.Flt = lensing->X12_sm_obj; break; }
    753     case MEAS_X22_SM_OBJ: { value.Flt = lensing->X22_sm_obj; break; }
    754     case MEAS_E1_SM_OBJ:  { value.Flt = lensing->E1_sm_obj; break; }
    755     case MEAS_E2_SM_OBJ:  { value.Flt = lensing->E2_sm_obj; break; }
    756     case MEAS_X11_SH_OBJ: { value.Flt = lensing->X11_sh_obj; break; }
    757     case MEAS_X12_SH_OBJ: { value.Flt = lensing->X12_sh_obj; break; }
    758     case MEAS_X22_SH_OBJ: { value.Flt = lensing->X22_sh_obj; break; }
    759     case MEAS_E1_SH_OBJ:  { value.Flt = lensing->E1_sh_obj; break; }
    760     case MEAS_E2_SH_OBJ:  { value.Flt = lensing->E2_sh_obj; break; }
    761     case MEAS_X11_SM_PSF: { value.Flt = lensing->X11_sm_psf; break; }
    762     case MEAS_X12_SM_PSF: { value.Flt = lensing->X12_sm_psf; break; }
    763     case MEAS_X22_SM_PSF: { value.Flt = lensing->X22_sm_psf; break; }
    764     case MEAS_E1_SM_PSF:  { value.Flt = lensing->E1_sm_psf; break; }
    765     case MEAS_E2_SM_PSF:  { value.Flt = lensing->E2_sm_psf; break; }
    766     case MEAS_X11_SH_PSF: { value.Flt = lensing->X11_sh_psf; break; }
    767     case MEAS_X12_SH_PSF: { value.Flt = lensing->X12_sh_psf; break; }
    768     case MEAS_X22_SH_PSF: { value.Flt = lensing->X22_sh_psf; break; }
    769     case MEAS_E1_SH_PSF:  { value.Flt = lensing->E1_sh_psf; break; }
    770     case MEAS_E2_SH_PSF:  { value.Flt = lensing->E2_sh_psf; break; }
    771 
    772     case MEAS_F_AP_R5:       { value.Flt = lensing-> F_ApR5; break; }
    773     case MEAS_F_ERR_AP_R5:   { value.Flt = lensing->dF_ApR5; break; }
    774     case MEAS_F_STDEV_AP_R5: { value.Flt = lensing->sF_ApR5; break; }
    775     case MEAS_F_FILL_AP_R5:  { value.Flt = lensing->fF_ApR5; break; }
    776     case MEAS_F_AP_R6:       { value.Flt = lensing-> F_ApR6; break; }
    777     case MEAS_F_ERR_AP_R6:   { value.Flt = lensing->dF_ApR6; break; }
    778     case MEAS_F_STDEV_AP_R6: { value.Flt = lensing->sF_ApR6; break; }
    779     case MEAS_F_FILL_AP_R6:  { value.Flt = lensing->fF_ApR6; break; }
    780     case MEAS_F_AP_R7:       { value.Flt = lensing-> F_ApR7; break; }
    781     case MEAS_F_ERR_AP_R7:   { value.Flt = lensing->dF_ApR7; break; }
    782     case MEAS_F_STDEV_AP_R7: { value.Flt = lensing->sF_ApR7; break; }
    783     case MEAS_F_FILL_AP_R7:  { value.Flt = lensing->fF_ApR7; break; }
    784 
    785     case MEAS_E_BV:             { value.Flt = starpar->Ebv;      break; }
    786     case MEAS_E_BV_ERR:         { value.Flt = starpar->dEbv;     break; }
    787     case MEAS_DISTANCE_MOD:     { value.Flt = starpar->DistMag;  break; }
    788     case MEAS_DISTANCE_MOD_ERR: { value.Flt = starpar->dDistMag; break; }
    789     case MEAS_M_R:              { value.Flt = starpar->M_r;      break; }
    790     case MEAS_M_R_ERR:          { value.Flt = starpar->dM_r;     break; }
    791     case MEAS_FEH:              { value.Flt = starpar->FeH;      break; }
    792     case MEAS_FEH_ERR:          { value.Flt = starpar->dFeH;     break; }
    793     case MEAS_URA_GALMODEL:     { value.Flt = starpar->uRA;      break; }
    794     case MEAS_UDEC_GALMODEL:    { value.Flt = starpar->uDEC;     break; }
    795     case MEAS_RA_GALMODEL:      { value.Flt = starpar->R;        break; }
    796     case MEAS_DEC_GALMODEL:     { value.Flt = starpar->D;        break; }
     755    case MEAS_X11_SM_OBJ: { value.Flt = lensing ? lensing->X11_sm_obj : NAN; break; }
     756    case MEAS_X12_SM_OBJ: { value.Flt = lensing ? lensing->X12_sm_obj : NAN; break; }
     757    case MEAS_X22_SM_OBJ: { value.Flt = lensing ? lensing->X22_sm_obj : NAN; break; }
     758    case MEAS_E1_SM_OBJ:  { value.Flt = lensing ? lensing->E1_sm_obj  : NAN; break; }
     759    case MEAS_E2_SM_OBJ:  { value.Flt = lensing ? lensing->E2_sm_obj  : NAN; break; }
     760    case MEAS_X11_SH_OBJ: { value.Flt = lensing ? lensing->X11_sh_obj : NAN; break; }
     761    case MEAS_X12_SH_OBJ: { value.Flt = lensing ? lensing->X12_sh_obj : NAN; break; }
     762    case MEAS_X22_SH_OBJ: { value.Flt = lensing ? lensing->X22_sh_obj : NAN; break; }
     763    case MEAS_E1_SH_OBJ:  { value.Flt = lensing ? lensing->E1_sh_obj  : NAN; break; }
     764    case MEAS_E2_SH_OBJ:  { value.Flt = lensing ? lensing->E2_sh_obj  : NAN; break; }
     765    case MEAS_X11_SM_PSF: { value.Flt = lensing ? lensing->X11_sm_psf : NAN; break; }
     766    case MEAS_X12_SM_PSF: { value.Flt = lensing ? lensing->X12_sm_psf : NAN; break; }
     767    case MEAS_X22_SM_PSF: { value.Flt = lensing ? lensing->X22_sm_psf : NAN; break; }
     768    case MEAS_E1_SM_PSF:  { value.Flt = lensing ? lensing->E1_sm_psf  : NAN; break; }
     769    case MEAS_E2_SM_PSF:  { value.Flt = lensing ? lensing->E2_sm_psf  : NAN; break; }
     770    case MEAS_X11_SH_PSF: { value.Flt = lensing ? lensing->X11_sh_psf : NAN; break; }
     771    case MEAS_X12_SH_PSF: { value.Flt = lensing ? lensing->X12_sh_psf : NAN; break; }
     772    case MEAS_X22_SH_PSF: { value.Flt = lensing ? lensing->X22_sh_psf : NAN; break; }
     773    case MEAS_E1_SH_PSF:  { value.Flt = lensing ? lensing->E1_sh_psf  : NAN; break; }
     774    case MEAS_E2_SH_PSF:  { value.Flt = lensing ? lensing->E2_sh_psf  : NAN; break; }
     775
     776    case MEAS_E1_PSF:     { value.Flt = lensing ? lensing->E1_psf     : NAN; break; }
     777    case MEAS_E2_PSF:     { value.Flt = lensing ? lensing->E2_psf     : NAN; break; }
     778
     779    case MEAS_F_AP_R5:       { value.Flt = lensing ? lensing-> F_ApR5 : NAN; break; }
     780    case MEAS_F_ERR_AP_R5:   { value.Flt = lensing ? lensing->dF_ApR5 : NAN; break; }
     781    case MEAS_F_STDEV_AP_R5: { value.Flt = lensing ? lensing->sF_ApR5 : NAN; break; }
     782    case MEAS_F_FILL_AP_R5:  { value.Flt = lensing ? lensing->fF_ApR5 : NAN; break; }
     783    case MEAS_F_AP_R6:       { value.Flt = lensing ? lensing-> F_ApR6 : NAN; break; }
     784    case MEAS_F_ERR_AP_R6:   { value.Flt = lensing ? lensing->dF_ApR6 : NAN; break; }
     785    case MEAS_F_STDEV_AP_R6: { value.Flt = lensing ? lensing->sF_ApR6 : NAN; break; }
     786    case MEAS_F_FILL_AP_R6:  { value.Flt = lensing ? lensing->fF_ApR6 : NAN; break; }
     787    case MEAS_F_AP_R7:       { value.Flt = lensing ? lensing-> F_ApR7 : NAN; break; }
     788    case MEAS_F_ERR_AP_R7:   { value.Flt = lensing ? lensing->dF_ApR7 : NAN; break; }
     789    case MEAS_F_STDEV_AP_R7: { value.Flt = lensing ? lensing->sF_ApR7 : NAN; break; }
     790    case MEAS_F_FILL_AP_R7:  { value.Flt = lensing ? lensing->fF_ApR7 : NAN; break; }
     791
     792    case MEAS_E_BV:             { value.Flt = starpar ? starpar->Ebv      : NAN; break; }
     793    case MEAS_E_BV_ERR:         { value.Flt = starpar ? starpar->dEbv     : NAN; break; }
     794    case MEAS_DISTANCE_MOD:     { value.Flt = starpar ? starpar->DistMag  : NAN; break; }
     795    case MEAS_DISTANCE_MOD_ERR: { value.Flt = starpar ? starpar->dDistMag : NAN; break; }
     796    case MEAS_M_R:              { value.Flt = starpar ? starpar->M_r      : NAN; break; }
     797    case MEAS_M_R_ERR:          { value.Flt = starpar ? starpar->dM_r     : NAN; break; }
     798    case MEAS_FEH:              { value.Flt = starpar ? starpar->FeH      : NAN; break; }
     799    case MEAS_FEH_ERR:          { value.Flt = starpar ? starpar->dFeH     : NAN; break; }
     800    case MEAS_URA_GALMODEL:     { value.Flt = starpar ? starpar->uRA      : NAN; break; }
     801    case MEAS_UDEC_GALMODEL:    { value.Flt = starpar ? starpar->uDEC     : NAN; break; }
     802    case MEAS_RA_GALMODEL:      { value.Flt = starpar ? starpar->R        : NAN; break; }
     803    case MEAS_DEC_GALMODEL:     { value.Flt = starpar ? starpar->D        : NAN; break; }
    797804
    798805    // case MEAS_FLUX_PSF: /* OK */

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

    r39531 r39568  
    6262    if (fields[i].ID == MEAS_E2_SH_PSF)  return TRUE;
    6363
     64    if (fields[i].ID == MEAS_E1_PSF)     return TRUE;
     65    if (fields[i].ID == MEAS_E2_PSF)     return TRUE;
     66
    6467    if (fields[i].ID == MEAS_F_AP_R5)       return TRUE;
    6568    if (fields[i].ID == MEAS_F_ERR_AP_R5)   return TRUE;
    … …  
    105108    if (fields[i].magOption == MAG_OPTION_E1_SH_PSF)  return TRUE;
    106109    if (fields[i].magOption == MAG_OPTION_E2_SH_PSF)  return TRUE;
     110
     111    if (fields[i].magOption == MAG_OPTION_E1_PSF)     return TRUE;
     112    if (fields[i].magOption == MAG_OPTION_E2_PSF)     return TRUE;
    107113
    108114    if (fields[i].magOption == MAG_OPTION_F_AP_R5)       return TRUE;
    … …  
    268274  if (!strcasecmp (string, "E1_SH_PSF"))     return MAG_OPTION_E1_SH_PSF;
    269275  if (!strcasecmp (string, "E2_SH_PSF"))     return MAG_OPTION_E2_SH_PSF;
     276  if (!strcasecmp (string, "E1_PSF"))        return MAG_OPTION_E1_PSF;
     277  if (!strcasecmp (string, "E2_PSF"))        return MAG_OPTION_E2_PSF;
    270278  if (!strcasecmp (string, "F_AP_R5"))       return MAG_OPTION_F_AP_R5;
    271279  if (!strcasecmp (string, "F_ERR_AP_R5"))   return MAG_OPTION_F_ERR_AP_R5;
    … …  
    621629  if (!strcasecmp (fieldName, "E2_SH_PSF"))      ESCAPE (MEAS_E2_SH_PSF,  OPIHI_FLT);
    622630
     631  if (!strcasecmp (fieldName, "E1_PSF"))         ESCAPE (MEAS_E1_PSF,  OPIHI_FLT);
     632  if (!strcasecmp (fieldName, "E2_PSF"))         ESCAPE (MEAS_E2_PSF,  OPIHI_FLT);
     633
    623634  if (!strcasecmp (fieldName, "F_AP_R5"))        ESCAPE (MEAS_F_AP_R5,       OPIHI_FLT);
    624635  if (!strcasecmp (fieldName, "F_ERR_AP_R5"))    ESCAPE (MEAS_F_ERR_AP_R5,   OPIHI_FLT);
Note: See TracChangeset for help on using the changeset viewer.