IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jul 17, 2014, 12:32:26 PM (12 years ago)
Author:
eugene
Message:

merge changes (from past YEAR) into trunk

Location:
branches/eam_branches/ipp-ops-20130712/Ohana
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-ops-20130712/Ohana

    • Property svn:mergeinfo deleted

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

    r35416 r37067  
    2222
    2323/* magnitude types */
    24 enum {MAG_NONE,
    25       MAG_INST,
    26       MAG_CAT,
    27       MAG_APER,
    28       MAG_APER_INST,
    29       MAG_KRON,
    30       MAG_KRON_INST,
    31       MAG_KRON_ERR,
    32       MAG_SYS,
    33       MAG_REL,
    34       MAG_CAL,
    35       MAG_AVE,
    36       MAG_REF,
    37       MAG_ERR,
    38       MAG_STDEV,
    39       MAG_AVE_ERR,
    40       MAG_PHOT_FLAGS,
    41       MAG_CHISQ,
    42       MAG_NCODE,
    43       MAG_NPHOT,
    44       MAG_20,
    45       MAG_80,
    46       MAG_UC_DIST,
    47       MAG_STACK_DET_ID,
    48       MAG_FLUX_PSF,
    49       MAG_FLUX_PSF_ERR,
    50       MAG_FLUX_KRON,
    51       MAG_FLUX_KRON_ERR,
    52 };
     24
     25typedef enum {
     26  MAG_SRC_NONE,
     27  MAG_SRC_CHP,
     28  MAG_SRC_WRP,
     29  MAG_SRC_STK,
     30} dvoMagSourceType;
     31
     32typedef enum {
     33  MAG_LEVEL_NONE,       // -2.5*log(DN) [ie, not DN/sec]
     34  MAG_LEVEL_INST,               // -2.5*log(DN) [ie, not DN/sec]
     35  MAG_LEVEL_CAT,                // MAG_INST + 2.5*log(exptime) + C_lambda + K_lambda*(airmass - 1)
     36  MAG_LEVEL_SYS, // MAG_CAT + \sum_i A_i * (color_i - color_o) [color correction for measure photcode]
     37  MAG_LEVEL_REL, // MAG_SYS - Mcal [specific zero point for image]
     38  MAG_LEVEL_CAL, // MAG_REL + \sum_i A_i * (color_i - color_o) [color correction for average photcode]
     39  MAG_LEVEL_AVE,
     40  MAG_LEVEL_REF,
     41} dvoMagLevelType;
     42
     43typedef enum {
     44  MAG_OPTION_NONE,
     45  MAG_OPTION_MAG,
     46  MAG_OPTION_ERR,
     47  MAG_OPTION_FLUX,
     48  MAG_OPTION_FLUX_ERR,
     49  MAG_OPTION_STDEV,
     50  MAG_OPTION_CHISQ,
     51  MAG_OPTION_MIN,
     52  MAG_OPTION_MAX,
     53  MAG_OPTION_NCODE,
     54  MAG_OPTION_NPHOT, // Nused
     55  MAG_OPTION_UC_DIST,
     56  MAG_OPTION_STACK_DET_ID,
     57  MAG_OPTION_FLAGS,
     58} dvoMagOptionType;
     59
     60typedef enum {
     61  MAG_CLASS_NONE,
     62  MAG_CLASS_PSF,
     63  MAG_CLASS_KRON,
     64  MAG_CLASS_APER,
     65} dvoMagClassType;
    5366
    5467/* measure fields */
    … …  
    90103      MEAS_OBJ_FLAGS,
    91104      MEAS_SECFILT_FLAGS,
    92       MEAS_MAG,
     105      MEAS_PHOT, // photometry class of measurements
    93106      MEAS_MINST,
    94107      MEAS_MCAT,
    … …  
    144157      MEAS_EXTERN_ID,
    145158      MEAS_EXPNAME_AS_INT,
    146       MEAS_MCAL_OFFSET,
     159      MEAS_MCAL_OFFSET, // make this a dvoMagOption?
    147160      MEAS_FLAT,
    148161      MEAS_CENTER_OFFSET,
    149       MEAS_FLUX_PSF,
    150       MEAS_FLUX_PSF_ERR,
    151       MEAS_FLUX_KRON,
    152       MEAS_FLUX_KRON_ERR,
     162      MEAS_REF_COLOR,
    153163};
    154164
    … …  
    174184      AVE_TMEAN,
    175185      AVE_TRANGE,
     186      AVE_PSF_QF,
     187      AVE_PSF_QF_PERF,
     188      AVE_STARGAL,
    176189      AVE_Xp,
    177190      AVE_NMEAS,
    178191      AVE_NMISS,
    179192      AVE_NPOS,
    180       AVE_NPHOT,
    181       AVE_NCODE,
    182       AVE_MAG,
    183       AVE_dMAG,
    184       AVE_Xm,
    185193      AVE_OBJ_FLAGS,
    186194      AVE_TYPE,
    … …  
    190198      AVE_EXTID_HI,
    191199      AVE_EXTID_LO,
     200      AVE_REF_COLOR,
     201      AVE_PHOT, // photometry class of values
    192202};
     203
     204//       AVE_NPHOT,
     205//       AVE_NCODE,
     206//       AVE_MAG,
     207//       AVE_dMAG,
     208//       AVE_Xm,
    193209
    194210enum {IMAGE_ZERO,
    … …  
    257273      IMAGE_NFIT_ASTROM,
    258274      IMAGE_NLINK_PHOTOM,
    259       IMAGE_NLINK_ASTROM
     275      IMAGE_NLINK_ASTROM,
     276      IMAGE_REF_COLOR
    260277};
    261278
    … …  
    277294  int table;
    278295  int ID;
    279   int magMode;
     296
     297  dvoMagSourceType magSource; // chip, (forced) warp, stack [only relevant for averages]
     298  dvoMagLevelType magLevel;  // inst, cat, sys, rel, ave, ref, err, min, max, stdev, nphot, chisq,
     299  dvoMagOptionType magOption;  // psf, kron, aper
     300  dvoMagClassType magClass;
     301
    280302  char type;
    281303  PhotCode *photcode;
    … …  
    339361
    340362int          GetMagMode             PROTO((char *string));
    341 PhotCode    *ParsePhotcodeField     PROTO((char *field, int *mode, int def));
     363int          ParsePhotcodeField     PROTO((dbField *field, char *fieldName, int fieldID));
    342364int          ParseMeasureField      PROTO((dbField *field, char *fieldName));
    343365int          ParseAverageField      PROTO((dbField *field, char *fieldName));
    … …  
    372394
    373395// Some values used by code moved to libdvo from opihi.
    374 enum {OPIHI_FLT, OPIHI_INT};
     396enum {OPIHI_NOTYPE, OPIHI_FLT, OPIHI_INT};
    375397#define opihi_flt double
    376398#define opihi_int int
Note: See TracChangeset for help on using the changeset viewer.