IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 40243


Ignore:
Timestamp:
Dec 5, 2017, 6:02:41 AM (9 years ago)
Author:
eugene
Message:

split measure->Mcal into McalPSF and McalAPER

Location:
branches/eam_branches/ohana.20170822/src
Files:
23 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20170822/src/libautocode/def/measure-ps1-v6.d

    r40209 r40243  
    1313FIELD Mkron,          M_KRON,        float,          kron magnitude,               mag
    1414FIELD dMkron,         M_KRON_ERR,    float,          kron magnitude error,         mag
    15 FIELD Mcal,           M_CAL,         float,          image cal mag,                mag
     15FIELD McalPSF,        MCAL_PSF,      float,          image cal mag,                mag
    1616FIELD dMcal,          MAG_CAL_ERR,   float,          systematic calibration error, mag
    1717FIELD dt,             M_TIME,        float,          exposure time,                2.5*log(exptime)
    … …  
    4444
    4545FIELD Mflat,          M_FLAT,        float,          Static Flat-field offset,     mag
    46 FIELD dummy2,         PADDING,       int,            unused 4 bytes
     46FIELD McalAPER,       MCAL_APER,     float,          image cal mag for apertures,  mag
    4747
    4848# could these be packed into fewer bits?

  • branches/eam_branches/ohana.20170822/src/libautocode/def/measure.d

    r39262 r40243  
    1313FIELD Mkron,          M_KRON,        float,          kron magnitude,                 mag
    1414FIELD dMkron,         M_KRON_ERR,    float,          kron magnitude error,           mag
    15 FIELD Mcal,           M_CAL,         float,          image cal mag,                  mag
     15FIELD McalPSF,        MCAL_PSF,      float,          image cal mag,                  mag
    1616FIELD dMcal,          MAG_CAL_ERR,   float,          systematic calibration error,   mag
    1717FIELD dt,             M_TIME,        float,          exposure time,                  2.5*log(exptime)
    … …  
    4444
    4545FIELD Mflat,          M_FLAT,        float,          Static Flat-field offset,     mag
    46 FIELD dummy2,         PADDING,       int,            unused 4 bytes
     46FIELD McalAPER,       MCAL_APER,     float,          image cal mag for apertures,  mag
    4747
    4848# could these be packed into fewer bits?
    … …  
    5353FIELD averef,         AVE_REF,      unsigned int,   reference to average entry     
    5454
     55# internally, this is an unsigned int; however, we do NOT convert with TZERO/TSCAL on output
    5556FIELD detID,          DET_ID,       unsigned int,   detection ID
    5657FIELD objID,          OBJ_ID,       unsigned int,   unique ID for object in table
    5758FIELD catID,          CAT_ID,       unsigned int,   unique ID for table in which object was first realized
    5859
     60# extID needs to be on an 8-byte boundary
    5961# PSPS uses a 64-bit detection ID
    6062FIELD extID,          EXT_ID,       uint64_t,       external ID (eg PSPS detID)
    … …  
    9193FIELD dRsys,          POS_SYS_ERR,  short,          systematic error from astrom,   1/100 of pixels
    9294
     95# local astrometry scales
    9396FIELD posangle,       POSANGLE,     short,          position angle sky to chip,     (0xffff/360) deg
    9497FIELD pltscale,       PLTSCALE,     float,          plate scale,                    arcsec/pixel

  • branches/eam_branches/ohana.20170822/src/libdvo/include/dvo.h

    r40214 r40243  
    504504  float          M; // change to Mpsf eventually to disambiguate
    505505  float          Mkron;
    506   float          Mcal;
     506  float          McalPSF;
     507  float          McalAPER;
    507508  float          Mflat;
    508509  float          dM;

  • branches/eam_branches/ohana.20170822/src/libdvo/include/dvodb.h

    r40168 r40243  
    243243      MEAS_EXTERN_ID,
    244244      MEAS_EXPNAME_AS_INT,
    245       MEAS_MCAL_OFFSET, // make this a dvoMagOption?
     245      MEAS_MCAL_OFFSET_PSF, // make this a dvoMagOption?
     246      MEAS_MCAL_OFFSET_APER, // make this a dvoMagOption?
    246247      MEAS_FLAT,
    247248      MEAS_CENTER_OFFSET,

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dbExtractMeasures.c

    r39926 r40243  
    740740      break;
    741741
    742     case MEAS_MCAL_OFFSET: { value.Flt = measure[0].Mcal; break; }
     742    case MEAS_MCAL_OFFSET_PSF:  { value.Flt = measure[0].McalPSF;  break; }
     743    case MEAS_MCAL_OFFSET_APER: { value.Flt = measure[0].McalAPER; break; }
    743744    case MEAS_FLAT: { value.Flt = measure[0].Mflat; break; }
    744745

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dbFields.c

    r40211 r40243  
    609609  if (!strcasecmp (fieldName, "SKY"))            ESCAPE (MEAS_SKY,            OPIHI_FLT);
    610610  if (!strcasecmp (fieldName, "SKY_ERR"))        ESCAPE (MEAS_dSKY,           OPIHI_FLT);
    611   if (!strcasecmp (fieldName, "MCAL_OFFSET"))    ESCAPE (MEAS_MCAL_OFFSET,    OPIHI_FLT);
     611  if (!strcasecmp (fieldName, "MCAL_OFFSET"))    ESCAPE (MEAS_MCAL_OFFSET_PSF,    OPIHI_FLT);
     612  if (!strcasecmp (fieldName, "MCAL_OFFSET_PSF"))  ESCAPE (MEAS_MCAL_OFFSET_PSF,  OPIHI_FLT);
     613  if (!strcasecmp (fieldName, "MCAL_OFFSET_APER")) ESCAPE (MEAS_MCAL_OFFSET_APER, OPIHI_FLT);
    612614  if (!strcasecmp (fieldName, "FLAT"))           ESCAPE (MEAS_FLAT,           OPIHI_FLT);
    613615  if (!strcasecmp (fieldName, "CENTER_OFFSET"))  ESCAPE (MEAS_CENTER_OFFSET,  OPIHI_FLT);

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_catalog.c

    r40212 r40243  
    317317 measure->Mkron     = NAN;
    318318 measure->dMkron    = NAN;
    319  measure->Mcal      = NAN;
     319 measure->McalPSF   = NAN;
     320 measure->McalAPER  = NAN;
    320321 measure->dMcal     = NAN;
    321322 measure->dt        = NAN;
    … …  
    344345
    345346 measure->Mflat     = 0.0;
    346  measure->dummy2    = 0;
    347347
    348348 measure->Sky       = NAN;
    … …  
    395395 measure->D         = NAN;
    396396 measure->M         = NAN;
    397  measure->Mcal      = NAN;
     397 measure->McalPSF   = NAN;
     398 measure->McalAPER  = NAN;
    398399 measure->dM        = NAN;
    399400

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_1.c

    r40212 r40243  
    1717    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
    1818    out[i].M          = in[i].M;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021    out[i].dM         = in[i].dM;
    2122    out[i].dt         = in[i].dt;
    … …  
    6465    out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
    6566    out[i].M          = in[i].M;
    66     out[i].Mcal       = in[i].Mcal;
     67    out[i].Mcal       = in[i].McalPSF;
    6768    out[i].dM         = in[i].dM;
    6869    out[i].dt         = in[i].dt;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_DEV_2.c

    r40212 r40243  
    1717    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
    1818    out[i].M          = in[i].M;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021    out[i].Map        = in[i].Map;
    2122    out[i].dM         = in[i].dM;
    … …  
    6263    out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
    6364    out[i].M          = in[i].M;
    64     out[i].Mcal       = in[i].Mcal;
     65    out[i].Mcal       = in[i].McalPSF;
    6566    out[i].Map        = in[i].Map;
    6667    out[i].dM         = in[i].dM;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_SIM.c

    r40212 r40243  
    1818    out[i].M          = in[i].M;
    1919    out[i].dM         = in[i].dM;
    20     out[i].Mcal       = in[i].Mcal;
     20    out[i].McalPSF    = in[i].Mcal;
     21    out[i].McalAPER   = in[i].Mcal;
    2122    out[i].dt         = in[i].dt;
    2223    out[i].airmass    = in[i].airmass;
    … …  
    6465    out[i].M          = in[i].M;
    6566    out[i].dM         = in[i].dM;
    66     out[i].Mcal       = in[i].Mcal;
     67    out[i].Mcal       = in[i].McalPSF;
    6768    out[i].dt         = in[i].dt;
    6869    out[i].airmass    = in[i].airmass;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V1.c

    r40212 r40243  
    1717    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
    1818    out[i].M          = in[i].M;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021    out[i].Map        = in[i].Map;
    2122    out[i].dM         = in[i].dM;
    … …  
    7172    out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
    7273    out[i].M          = in[i].M;
    73     out[i].Mcal       = in[i].Mcal;
     74    out[i].Mcal       = in[i].McalPSF;
    7475    out[i].Map        = in[i].Map;
    7576    out[i].dM         = in[i].dM;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V2.c

    r40212 r40243  
    1717    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
    1818    out[i].M          = in[i].M;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021    out[i].Map        = in[i].Map;
    2122    out[i].dM         = in[i].dM;
    … …  
    7273    out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
    7374    out[i].M          = in[i].M;
    74     out[i].Mcal       = in[i].Mcal;
     75    out[i].Mcal       = in[i].McalPSF;
    7576    out[i].Map        = in[i].Map;
    7677    out[i].dM         = in[i].dM;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V3.c

    r40212 r40243  
    1717    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
    1818    out[i].M          = in[i].M;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021    out[i].Map        = in[i].Map;
    2122    out[i].dM         = in[i].dM;
    … …  
    7273    out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
    7374    out[i].M          = in[i].M;
    74     out[i].Mcal       = in[i].Mcal;
     75    out[i].Mcal       = in[i].McalPSF;
    7576    out[i].Map        = in[i].Map;
    7677    out[i].dM         = in[i].dM;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V4.c

    r40212 r40243  
    1717    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
    1818    out[i].M          = in[i].M;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021    out[i].Map        = in[i].Map;
    2122    out[i].Mkron      = in[i].Mkron;
    … …  
    8182    out[i].dD         = 3600.0*(ave[averef].D - in[i].D);
    8283    out[i].M          = in[i].M;
    83     out[i].Mcal       = in[i].Mcal;
     84    out[i].Mcal       = in[i].McalPSF;
    8485    out[i].Map        = in[i].Map;
    8586    out[i].Mkron      = in[i].Mkron;
    … …  
    518519    out[i].D          = ave[averef].D - in[i].dD / 3600.0;
    519520    out[i].M          = in[i].M;
    520     out[i].Mcal       = in[i].Mcal;
     521    out[i].McalPSF    = in[i].Mcal;
     522    out[i].McalAPER   = in[i].Mcal;
    521523    out[i].Map        = in[i].Map;
    522524    out[i].Mkron      = in[i].Mkron;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5.c

    r40212 r40243  
    2222    out[i].Mkron      = in[i].Mkron;
    2323    out[i].dMkron     = in[i].dMkron;
    24     out[i].Mcal       = in[i].Mcal;
     24    out[i].McalPSF    = in[i].Mcal;
     25    out[i].McalAPER   = in[i].Mcal;
    2526    out[i].dMcal      = in[i].dMcal;
    2627    out[i].dt         = in[i].dt;
    … …  
    9697    out[i].Mkron      = in[i].Mkron;
    9798    out[i].dMkron     = in[i].dMkron;
    98     out[i].Mcal       = in[i].Mcal;
     99    out[i].Mcal       = in[i].McalPSF;
    99100    out[i].dMcal      = in[i].dMcal;
    100101    out[i].dt         = in[i].dt;
    … …  
    16741675    out[i].Mkron      = in[i].Mkron;
    16751676    out[i].dMkron     = in[i].dMkron;
    1676     out[i].Mcal       = in[i].Mcal;
     1677    out[i].McalPSF    = in[i].Mcal;
     1678    out[i].McalAPER   = in[i].Mcal;
    16771679    out[i].dMcal      = in[i].dMcal;
    16781680    out[i].dt         = in[i].dt;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V5_LOAD.c

    r40212 r40243  
    2222    out[i].Mkron      = in[i].Mkron;
    2323    out[i].dMkron     = in[i].dMkron;
    24     out[i].Mcal       = in[i].Mcal;
     24    out[i].McalPSF    = in[i].Mcal;
     25    out[i].McalAPER   = in[i].Mcal;
    2526    out[i].dMcal      = in[i].dMcal;
    2627    out[i].dt         = in[i].dt;
    … …  
    9697    out[i].Mkron      = in[i].Mkron;
    9798    out[i].dMkron     = in[i].dMkron;
    98     out[i].Mcal       = in[i].Mcal;
     99    out[i].Mcal       = in[i].McalPSF;
    99100    out[i].dMcal      = in[i].dMcal;
    100101    out[i].dt         = in[i].dt;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_PS1_V6.c

    r40212 r40243  
    2222    out[i].Mkron      = in[i].Mkron;
    2323    out[i].dMkron     = in[i].dMkron;
    24     out[i].Mcal       = in[i].Mcal;
     24    out[i].McalPSF    = in[i].McalPSF;
     25    out[i].McalAPER   = in[i].McalAPER;
    2526    out[i].dMcal      = in[i].dMcal;
    2627    out[i].dt         = in[i].dt;
    … …  
    9697    out[i].Mkron      = in[i].Mkron;
    9798    out[i].dMkron     = in[i].dMkron;
    98     out[i].Mcal       = in[i].Mcal;
     99    out[i].McalPSF    = in[i].McalPSF;
     100    out[i].McalAPER   = in[i].McalAPER;
    99101    out[i].dMcal      = in[i].dMcal;
    100102    out[i].dt         = in[i].dt;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_elixir.c

    r40212 r40243  
    2424    out[i].dM       = (in[i].dM      == NAN_U_CHAR)  ? NAN : in[i].dM     * 0.001;
    2525    out[i].dt       = (in[i].dt      == NAN_S_SHORT) ? NAN : in[i].dt     * 0.001;
    26     out[i].Mcal     = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
     26    out[i].McalPSF  = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
     27    out[i].McalAPER = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
    2728    out[i].Map      = (in[i].Mgal    == NAN_S_SHORT) ? NAN : in[i].Mgal   * 0.001;
    2829    out[i].airmass  = (in[i].airmass == NAN_S_SHORT) ? NAN : in[i].airmass* 0.001;
    … …  
    7273    out[i].dM       = isnan(in[i].dM     ) ? NAN_U_CHAR  : in[i].dM      * 1000.0;
    7374    out[i].dt       = isnan(in[i].dt     ) ? NAN_S_SHORT : in[i].dt      * 1000.0;
    74     out[i].Mcal     = isnan(in[i].Mcal   ) ? NAN_S_SHORT : in[i].Mcal    * 1000.0;
     75    out[i].Mcal     = isnan(in[i].McalPSF) ? NAN_S_SHORT : in[i].McalPSF * 1000.0;
    7576    out[i].Mgal     = isnan(in[i].Map    ) ? NAN_S_SHORT : in[i].Map     * 1000.0;
    7677    out[i].airmass  = isnan(in[i].airmass) ? NAN_S_SHORT : in[i].airmass * 1000.0;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_loneos.c

    r40212 r40243  
    2626    out[i].M        = (in[i].M       == NAN_S_SHORT) ? NAN : in[i].M      * 0.001;
    2727    out[i].dM       = (in[i].dM      == NAN_U_CHAR)  ? NAN : in[i].dM     * 0.001;
    28     out[i].Mcal     = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
     28    out[i].McalPSF  = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
     29    out[i].McalAPER = (in[i].Mcal    == NAN_S_SHORT) ? NAN : in[i].Mcal   * 0.001;
    2930    out[i].Map      = (in[i].M       == NAN_S_SHORT) ? NAN : in[i].M      * 0.001;
    3031    out[i].photcode = in[i].source;
    … …  
    5960    out[i].M      = isnan(in[i].M      ) ? NAN_S_SHORT : in[i].M       * 1000.0;
    6061    out[i].dM     = isnan(in[i].dM     ) ? NAN_U_CHAR  : in[i].dM      * 1000.0;
    61     out[i].Mcal   = isnan(in[i].Mcal   ) ? NAN_S_SHORT : in[i].Mcal    * 1000.0;
     62    out[i].Mcal   = isnan(in[i].McalPSF) ? NAN_S_SHORT : in[i].McalPSF * 1000.0;
    6263    out[i].source = in[i].photcode;
    6364    out[i].t      = in[i].t;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_0.c

    r40212 r40243  
    1717    out[i].M          = in[i].M;
    1818    out[i].dM         = in[i].dM;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021
    2122    out[i].airmass    = in[i].airmass;
    … …  
    6869    out[i].M          = in[i].M;
    6970    out[i].dM         = in[i].dM;
    70     out[i].Mcal       = in[i].Mcal;
     71    out[i].Mcal       = in[i].McalPSF;
    7172    out[i].airmass    = in[i].airmass;
    7273    out[i].az         = in[i].az;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_convert_panstarrs_DEV_1.c

    r40212 r40243  
    1717    out[i].M          = in[i].M;
    1818    out[i].dM         = in[i].dM;
    19     out[i].Mcal       = in[i].Mcal;
     19    out[i].McalPSF    = in[i].Mcal;
     20    out[i].McalAPER   = in[i].Mcal;
    2021
    2122    out[i].airmass    = in[i].airmass;
    … …  
    6869    out[i].M          = in[i].M;
    6970    out[i].dM         = in[i].dM;
    70     out[i].Mcal       = in[i].Mcal;
     71    out[i].Mcal       = in[i].McalPSF;
    7172    out[i].airmass    = in[i].airmass;
    7273    out[i].az         = in[i].az;

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_photcode_ops.c

    r40214 r40243  
    381381
    382382  float Mraw = NAN;
     383  float Mcal = NAN;
    383384  switch (class) {
    384385    case MAG_CLASS_PSF:
    385386      Mraw = measure[0].M;
     387      Mcal = measure[0].McalPSF;
    386388      break;
    387389    case MAG_CLASS_KRON:
    388390      Mraw = measure[0].Mkron;
     391      Mcal = measure[0].McalAPER;
    389392      break;
    390393    case MAG_CLASS_APER:
    391394      Mraw = measure[0].Map;
     395      Mcal = measure[0].McalAPER;
    392396      break;
    393397    default:
    … …  
    398402  }
    399403  float Mflat = isfinite(measure[0].Mflat) ? measure[0].Mflat : 0.0;
    400   float Mcat = Mraw - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal - Mflat;
     404  float Mcat = Mraw - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - Mcal - Mflat;
    401405
    402406  /* for DEP, color must be made of PRI/SEC */
    … …  
    11301134
    11311135  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
    1132   float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
    1133   float Moff = Mcal - ZERO_POINT + 8.9;
    1134   float Foff = 3630.8 * MagToFlux(Mcal);
     1136  float Mzpt = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
     1137  float Moff = Mzpt - ZERO_POINT + 8.9;
     1138  float Foff = 3630.8 * MagToFlux(Mzpt);
    11351139  float Fcat = NAN;
    11361140  switch (class) {
    … …  
    11581162
    11591163  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
    1160   float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
    1161   float Moff = Mcal - ZERO_POINT + 8.9;
    1162   float Foff = 3630.8 * MagToFlux(Mcal);
     1164  float Mzpt = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
     1165  float Moff = Mzpt - ZERO_POINT + 8.9;
     1166  float Foff = 3630.8 * MagToFlux(Mzpt);
    11631167  float Fcat = NAN;
    11641168  switch (class) {
    … …  
    12031207
    12041208  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
     1209
     1210  // use Mcal APER for aperture-like data
     1211  float Mcal = (class == MAG_CLASS_PSF) ? measure[0].McalPSF : measure[0].McalAPER;
    12051212  float Mflat = isfinite(measure[0].Mflat) ? measure[0].Mflat : 0.0;
    1206   float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal - Mflat;
    1207   float Moff = Mcal - ZERO_POINT + 8.9;
    1208   float Foff = 3630.8 * MagToFlux(Mcal);
     1213
     1214  float Mzpt = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - Mcal - Mflat;
     1215  float Moff = Mzpt - ZERO_POINT + 8.9;
     1216  float Foff = 3630.8 * MagToFlux(Mzpt);
    12091217  float Fcat = NAN;
    12101218  switch (class) {
    … …  
    14701478
    14711479  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
    1472   float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
    1473   float Moff = Mcal - ZERO_POINT + 8.9;
    1474   float Foff = 3630.8 * MagToFlux(Mcal);
     1480  float Mzpt = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
     1481  float Moff = Mzpt - ZERO_POINT + 8.9;
     1482  float Foff = 3630.8 * MagToFlux(Mzpt);
    14751483
    14761484  // use dFlux if we can, but use dMag if we must:
    … …  
    15161524
    15171525  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
    1518   float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
    1519   float Moff = Mcal - ZERO_POINT + 8.9;
    1520   float Foff = 3630.8 * MagToFlux(Mcal);
     1526  float Mzpt = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C;
     1527  float Moff = Mzpt - ZERO_POINT + 8.9;
     1528  float Foff = 3630.8 * MagToFlux(Mzpt);
    15211529
    15221530  // use dFlux if we can, but use dMag if we must:
    … …  
    15791587
    15801588  // measure.M has the static ZERO_POINT (25.0) applied, but not measure.Flux
     1589  // XXX fix this too:
    15811590  float Mflat = isfinite(measure[0].Mflat) ? measure[0].Mflat : 0.0;
    1582   float Mcal = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal - Mflat;
    1583   float Moff = Mcal - ZERO_POINT + 8.9;
    1584   float Foff = 3630.8 * MagToFlux(Mcal);
     1591  float Mcal = (class == MAG_CLASS_PSF) ? measure[0].McalPSF : measure[0].McalAPER;
     1592
     1593  float Mzpt = code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - Mcal - Mflat;
     1594  float Moff = Mzpt - ZERO_POINT + 8.9;
     1595  float Foff = 3630.8 * MagToFlux(Mzpt);
    15851596
    15861597  // use dFlux if we can, but use dMag if we must:
    … …  
    17421753
    17431754  float Mraw = NAN;
     1755  float Mcal = NAN;
    17441756  switch (class) {
    17451757    case MAG_CLASS_PSF:
    17461758      Mraw = measure[0].M;
     1759      Mcal = measure[0].McalPSF;
    17471760      break;
    17481761    case MAG_CLASS_KRON:
    17491762      Mraw = measure[0].Mkron;
     1763      Mcal = measure[0].McalAPER;
    17501764      break;
    17511765    case MAG_CLASS_APER:
    17521766      // Mraw = measure[0].Map; // MeasureTiny does not have Map
     1767      // Mcal = measure[0].McalAPER;
    17531768      break;
    17541769    default:
    … …  
    17591774  }
    17601775  float Mflat = isfinite(measure[0].Mflat) ? measure[0].Mflat : 0.0;
    1761   float Mcat = Mraw - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - measure[0].Mcal - Mflat;
     1776  float Mcat = Mraw - ZERO_POINT + code[0].K*(measure[0].airmass - 1.000) + SCALE*code[0].C - Mcal - Mflat;
    17621777
    17631778  /* for DEP, color must be made of PRI/SEC */

  • branches/eam_branches/ohana.20170822/src/libdvo/src/dvo_tiny_values.c

    r40229 r40243  
    2020  measureT[0].M          = measure[0].M;
    2121  measureT[0].Mkron      = measure[0].Mkron;
    22   measureT[0].Mcal       = measure[0].Mcal;
     22  measureT[0].McalPSF    = measure[0].McalPSF;
     23  measureT[0].McalAPER   = measure[0].McalAPER;
    2324  measureT[0].dM         = measure[0].dM;
    2425  measureT[0].airmass    = measure[0].airmass;
Note: See TracChangeset for help on using the changeset viewer.