IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 38218


Ignore:
Timestamp:
Apr 29, 2015, 8:15:06 PM (11 years ago)
Author:
eugene
Message:

working on the galshape table

Location:
branches/eam_branches/ohana.20150429/src
Files:
2 added
9 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ohana.20150429/src/libautocode/Makefile.Targets

    r38153 r38218  
    5555$(ASRC)/starpar-ps1-v5.$(ARCH).o \
    5656$(ASRC)/starpar-ps1-sim.$(ARCH).o \
     57$(ASRC)/galshape.$(ARCH).o \
     58$(ASRC)/galshape-ps1-v5.$(ARCH).o \
    5759$(ASRC)/missing.$(ARCH).o \
    5860$(ASRC)/photcode.$(ARCH).o \

  • branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v1.d

    r36833 r38218  
    2626FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
    2727FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
    28 FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
     28FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
    2929
    3030FIELD measureOffset,  OFF_MEASURE, uint32_t,        offset to first psf measurement

  • branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v2.d

    r36833 r38218  
    3131FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
    3232FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
    33 FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
     33FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
    3434
    3535FIELD measureOffset,  OFF_MEASURE, uint32_t,        offset to first psf measurement

  • branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v3.d

    r36833 r38218  
    3131FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
    3232FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
    33 FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
     33FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
    3434
    3535FIELD measureOffset,  OFF_MEASURE, uint32_t,        offset to first psf measurement

  • branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v4.d

    r36833 r38218  
    3434FIELD Nmeasure,       NMEASURE,    unsigned short,  number of psf measurements
    3535FIELD Nmissing,       NMISSING,    unsigned short,  number of missings
    36 FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
     36FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshaped measurements
    3737
    3838FIELD measureOffset,  OFF_MEASURE, uint32_t,        offset to first psf measurement

  • branches/eam_branches/ohana.20150429/src/libautocode/def/average-ps1-v5.d

    r37807 r38218  
    4141FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
    4242FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
    43 FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
     43FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
    4444
    45 FIELD measureOffset,  OFF_MEASURE, int,             offset to first psf measurement
    46 FIELD missingOffset,  OFF_MISSING, int,             offset to first missing obs
    47 FIELD lensingOffset,  OFF_LENSING, int,             offset to first lensing obs
    48 FIELD lensobjOffset,  OFF_LENSOBJ, int,             offset to mean lensing data
    49 FIELD starparOffset,  OFF_STARPAR, int,             offset to stellar parameter data
    50 FIELD extendOffset,   OFF_EXTEND,  int,             offset to extended object entry
     45FIELD measureOffset,  OFF_MEASURE,  int,            offset to first psf measurement
     46FIELD missingOffset,  OFF_MISSING,  int,            offset to first missing obs
     47FIELD lensingOffset,  OFF_LENSING,  int,            offset to first lensing obs
     48FIELD lensobjOffset,  OFF_LENSOBJ,  int,            offset to mean lensing data
     49FIELD starparOffset,  OFF_STARPAR,  int,            offset to stellar parameter data
     50FIELD galshapeOffset, OFF_GALSHAPE, int,            offset to galshape object entry
    5151
    5252FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars

  • branches/eam_branches/ohana.20150429/src/libautocode/def/average.d

    r37807 r38218  
    4141FIELD Nlensing,       NLENSING,    unsigned short,  number of lensing measurements
    4242FIELD Nlensobj,       NLENSOBJ,    unsigned short,  number of lensing measurements
    43 FIELD Nextend,        NEXTEND,     unsigned short,  number of extended measurements
     43FIELD Ngalshape,      NGALSHAPE,   unsigned short,  number of galshape measurements
    4444
    45 FIELD measureOffset,  OFF_MEASURE, int,             offset to first psf measurement
    46 FIELD missingOffset,  OFF_MISSING, int,             offset to first missing obs
    47 FIELD lensingOffset,  OFF_LENSING, int,             offset to first lensing obs
    48 FIELD lensobjOffset,  OFF_LENSOBJ, int,             offset to mean lensing data
    49 FIELD starparOffset,  OFF_STARPAR, int,             offset to stellar parameter data
    50 FIELD extendOffset,   OFF_EXTEND, int,             offset to extended object entry
     45FIELD measureOffset,  OFF_MEASURE,  int,             offset to first psf measurement
     46FIELD missingOffset,  OFF_MISSING,  int,             offset to first missing obs
     47FIELD lensingOffset,  OFF_LENSING,  int,            offset to first lensing obs
     48FIELD lensobjOffset,  OFF_LENSOBJ,  int,            offset to mean lensing data
     49FIELD starparOffset,  OFF_STARPAR,  int,            offset to stellar parameter data
     50FIELD galshapeOffset, OFF_GALSHAPE, int,            offset to extended object entry
    5151
    5252FIELD refColorBlue,   REF_COLOR_BLUE, float,        color of astrometry ref stars

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

    r38154 r38218  
    5555
    5656/* catalog values to be loaded */
    57 # define LOAD_NONE      0x0000
    58 # define LOAD_AVES      0x0001
    59 # define LOAD_MEAS      0x0002
    60 # define LOAD_MISS      0x0004
    61 # define LOAD_SECF      0x0008
    62 # define SKIP_AVES      0x0010
    63 # define SKIP_MEAS      0x0020
    64 # define SKIP_MISS      0x0040
    65 # define SKIP_SECF      0x0080
    66 # define LOAD_LENSING   0x0100
    67 # define LOAD_LENSOBJ   0x0200
    68 # define SKIP_LENSING   0x0400
    69 # define SKIP_LENSOBJ   0x0800
    70 # define LOAD_STARPAR   0x1000
    71 # define SKIP_STARPAR   0x2000
     57typedef enum {
     58  LOAD_NONE     = 0x0000,
     59  LOAD_AVES     = 0x0001,
     60  LOAD_MEAS     = 0x0002,
     61  LOAD_MISS     = 0x0004,
     62  LOAD_SECF     = 0x0008,
     63  SKIP_AVES     = 0x0010,
     64  SKIP_MEAS     = 0x0020,
     65  SKIP_MISS     = 0x0040,
     66  SKIP_SECF     = 0x0080,
     67  LOAD_LENSING  = 0x0100,
     68  LOAD_LENSOBJ  = 0x0200,
     69  SKIP_LENSING  = 0x0400,
     70  SKIP_LENSOBJ  = 0x0800,
     71  LOAD_STARPAR  = 0x1000,
     72  SKIP_STARPAR  = 0x2000,
     73  LOAD_GALSHAPE = 0x4000,
     74  SKIP_GALSHAPE = 0x8000,
     75} DVOCatFlags;
    7276
    7377/* photometry code types */
    7478// # define PHOT_PRI 0x01
    75 # define PHOT_SEC 0x02
    76 # define PHOT_DEP 0x03
    77 # define PHOT_REF 0x04
    78 # define PHOT_ALT 0x05  /* never stored, only for look-ups */
    79 # define PHOT_MAG 0x06  /* generic magnitude; never stored */
     79typedef enum {
     80  PHOT_SEC  = 0x02,
     81  PHOT_DEP  = 0x03,
     82  PHOT_REF  = 0x04,
     83  PHOT_ALT  = 0x05,  /* never stored, only for look-ups */
     84  PHOT_MAG  = 0x06,  /* generic magnitude; never stored */
     85} DVOPhotCodeTypes;
    8086
    8187/* Image.code values -- these values are 32 bit (as of PS1_V1) */
    … …  
    704710  unsigned short   Nlensing;             // number of lensing measurements
    705711  unsigned short   Nlensobj;             // number of lensing measurements
    706   unsigned short   Nextend;              // number of extended measurements
     712  unsigned short   Ngalshape;            // number of galshape measurements
    707713  int              measureOffset;        // offset to first psf measurement
    708714  int              missingOffset;        // offset to first missing obs
    709   int              lensingOffset;        // offset to first lensing obs
     715  int              galshapeOffset;       // offset to first lensing obs
    710716  int              lensobjOffset;        // offset to mean lensing data
    711717  int              extendOffset;         // offset to extended object entry
    … …  
    742748
    743749  // lensing data (optional?)
    744   Lensing *lensing;
    745   Lensobj *lensobj;
    746   StarPar *starpar;
     750  Lensing  *lensing;
     751  Lensobj  *lensobj;
     752  StarPar  *starpar;
     753  GalShape *galshape;
    747754
    748755  int Nsecfilt;  /* number of secfilt entries for each average entry */
    749   off_t Naverage,   Nmeasure,   Nmissing,   Nlensing,      Nlensobj,      Nstarpar,      Nsecf_mem;  /* current number of each component in memory */
    750   off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Nsecf_disk; /* current number of each component on disk */
    751   off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Nsecf_off;  /* index of first loaded data value */
     756  off_t Naverage,   Nmeasure,   Nmissing,   Nlensing,      Nlensobj,      Nstarpar,      Ngalshape,      Nsecf_mem;  /* current number of each component in memory */
     757  off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Ngalshape_disk, Nsecf_disk; /* current number of each component on disk */
     758  off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Ngalshape_off,  Nsecf_off;  /* index of first loaded data value */
    752759
    753760  // note that we use these for the full-sky relphot analysis
    … …  
    765772
    766773  /* pointers to split data files */
    767   struct Catalog *measure_catalog;              /* measure catalog data (split) */
    768   struct Catalog *missing_catalog;              /* missing catalog data (split) */
    769   struct Catalog *secfilt_catalog;              /* secfilt catalog data (split) */
    770   struct Catalog *lensing_catalog;              /* lensing catalog data (split) */
    771   struct Catalog *lensobj_catalog;              /* lensobj catalog data (split) */
    772   struct Catalog *starpar_catalog;              /* starpar catalog data (split) */
     774  struct Catalog *measure_catalog;              /* measure  catalog data (split) */
     775  struct Catalog *missing_catalog;              /* missing  catalog data (split) */
     776  struct Catalog *secfilt_catalog;              /* secfilt  catalog data (split) */
     777  struct Catalog *lensing_catalog;              /* lensing  catalog data (split) */
     778  struct Catalog *lensobj_catalog;              /* lensobj  catalog data (split) */
     779  struct Catalog *starpar_catalog;              /* starpar  catalog data (split) */
     780  struct Catalog *galshape_catalog;             /* galshape catalog data (split) */
    773781
    774782  unsigned int objID;
    … …  
    781789  int sorted;                           /* is measure table average-sorted? (NOTE this is an int only because gfits_scan %t requires it) */
    782790 
    783   short catflags; /* choices to be loaded */
     791  DVOCatFlags catflags; /* choices to be loaded */
    784792
    785793  /* pointers for data manipulation */
    … …  
    11061114void dvo_lensobj_init (Lensobj *lensobj, int toZero);
    11071115void dvo_starpar_init (StarPar *starpar);
     1116void dvo_galshape_init (GalShape *galshape);
    11081117
    11091118void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);

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

    r38062 r38218  
    131131  average->Nlensobj        = 0;
    132132  average->Nstarpar        = 0;
    133   average->Nextend         = 0;
     133  average->Ngalshape       = 0;
    134134
    135135  average->measureOffset   = -1;
    … …  
    138138  average->lensobjOffset   = -1;
    139139  average->starparOffset   = -1;
    140   average->extendOffset    = -1;
     140  average->galshapeOffset  = -1;
    141141
    142142  average->refColorBlue    = NAN;
    … …  
    466466
    467467// init all data, or just catalog data
     468void dvo_galshape_init (GalShape *galshape) {
     469  galshape->Xfit         = NAN;
     470  galshape->Yfit         = NAN;
     471  galshape->mag          = NAN;
     472  galshape->magErr       = NAN;
     473  galshape->majorAxis    = NAN;
     474  galshape->minorAxis    = NAN;
     475  galshape->majorAxisErr = NAN;
     476  galshape->minorAxisErr = NAN;
     477  galshape->theta        = NAN;
     478  galshape->theta_err    = NAN;
     479  galshape->index        = NAN;
     480  galshape->chisq        = NAN;
     481  galshape->Npix         = 0;
     482
     483  galshape->detID   = -1;
     484  galshape->objID   = -1;
     485  galshape->catID   = -1;
     486  galshape->imageID = -1;
     487
     488  galshape->photcode = 0;
     489  galshape->modelType = 0;
     490
     491  galshape->averef = 0;
     492  galshape->padding = 0;
     493}
     494
     495// init all data, or just catalog data
    468496void dvo_catalog_init (Catalog *catalog, int complete) {
    469497
Note: See TracChangeset for help on using the changeset viewer.