Changeset 38218 for branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h

Timestamp:

Apr 29, 2015, 8:15:06 PM (11 years ago)

Author:

eugene

Message:

working on the galshape table

File:

• branches/eam_branches/ohana.20150429/src/libdvo/include/dvo.h (modified) (6 diffs)

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

@@ -55 +55 @@
 
 /* catalog values to be loaded */
-# define LOAD_NONE      0x0000
-# define LOAD_AVES      0x0001
-# define LOAD_MEAS      0x0002
-# define LOAD_MISS      0x0004
-# define LOAD_SECF      0x0008 
-# define SKIP_AVES      0x0010
-# define SKIP_MEAS      0x0020
-# define SKIP_MISS      0x0040
-# define SKIP_SECF      0x0080
-# define LOAD_LENSING   0x0100
-# define LOAD_LENSOBJ   0x0200
-# define SKIP_LENSING   0x0400
-# define SKIP_LENSOBJ   0x0800
-# define LOAD_STARPAR   0x1000
-# define SKIP_STARPAR   0x2000
+typedef enum {
+  LOAD_NONE     = 0x0000,
+  LOAD_AVES     = 0x0001,
+  LOAD_MEAS     = 0x0002,
+  LOAD_MISS     = 0x0004,
+  LOAD_SECF     = 0x0008, 
+  SKIP_AVES     = 0x0010,
+  SKIP_MEAS     = 0x0020,
+  SKIP_MISS     = 0x0040,
+  SKIP_SECF     = 0x0080,
+  LOAD_LENSING  = 0x0100,
+  LOAD_LENSOBJ  = 0x0200,
+  SKIP_LENSING  = 0x0400,
+  SKIP_LENSOBJ  = 0x0800,
+  LOAD_STARPAR  = 0x1000,
+  SKIP_STARPAR  = 0x2000,
+  LOAD_GALSHAPE = 0x4000,
+  SKIP_GALSHAPE = 0x8000,
+} DVOCatFlags;
 
 /* photometry code types */
 // # define PHOT_PRI 0x01
-# define PHOT_SEC 0x02
-# define PHOT_DEP 0x03
-# define PHOT_REF 0x04
-# define PHOT_ALT 0x05  /* never stored, only for look-ups */
-# define PHOT_MAG 0x06  /* generic magnitude; never stored */
+typedef enum {
+  PHOT_SEC  = 0x02,
+  PHOT_DEP  = 0x03,
+  PHOT_REF  = 0x04,
+  PHOT_ALT  = 0x05,  /* never stored, only for look-ups */
+  PHOT_MAG  = 0x06,  /* generic magnitude; never stored */
+} DVOPhotCodeTypes;
 
 /* Image.code values -- these values are 32 bit (as of PS1_V1) */
@@ -704 +710 @@
   unsigned short   Nlensing;             // number of lensing measurements
   unsigned short   Nlensobj;             // number of lensing measurements
-  unsigned short   Nextend;              // number of extended measurements
+  unsigned short   Ngalshape;            // number of galshape measurements
   int              measureOffset;        // offset to first psf measurement
   int              missingOffset;        // offset to first missing obs
-  int              lensingOffset;        // offset to first lensing obs
+  int              galshapeOffset;       // offset to first lensing obs
   int              lensobjOffset;        // offset to mean lensing data
   int              extendOffset;         // offset to extended object entry
@@ -742 +748 @@
 
   // lensing data (optional?)
-  Lensing *lensing;
-  Lensobj *lensobj;
-  StarPar *starpar;
+  Lensing  *lensing;
+  Lensobj  *lensobj;
+  StarPar  *starpar;
+  GalShape *galshape;
 
   int Nsecfilt;  /* number of secfilt entries for each average entry */
-  off_t Naverage,   Nmeasure,   Nmissing,   Nlensing,      Nlensobj,      Nstarpar,      Nsecf_mem;  /* current number of each component in memory */
-  off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Nsecf_disk; /* current number of each component on disk */
-  off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Nsecf_off;  /* index of first loaded data value */
+  off_t Naverage,   Nmeasure,   Nmissing,   Nlensing,      Nlensobj,      Nstarpar,      Ngalshape,      Nsecf_mem;  /* current number of each component in memory */
+  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 */
+  off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Ngalshape_off,  Nsecf_off;  /* index of first loaded data value */
 
   // note that we use these for the full-sky relphot analysis
@@ -765 +772 @@
 
   /* pointers to split data files */
-  struct Catalog *measure_catalog;              /* measure catalog data (split) */
-  struct Catalog *missing_catalog;              /* missing catalog data (split) */
-  struct Catalog *secfilt_catalog;              /* secfilt catalog data (split) */
-  struct Catalog *lensing_catalog;              /* lensing catalog data (split) */
-  struct Catalog *lensobj_catalog;              /* lensobj catalog data (split) */
-  struct Catalog *starpar_catalog;              /* starpar catalog data (split) */
+  struct Catalog *measure_catalog;              /* measure  catalog data (split) */
+  struct Catalog *missing_catalog;              /* missing  catalog data (split) */
+  struct Catalog *secfilt_catalog;              /* secfilt  catalog data (split) */
+  struct Catalog *lensing_catalog;              /* lensing  catalog data (split) */
+  struct Catalog *lensobj_catalog;              /* lensobj  catalog data (split) */
+  struct Catalog *starpar_catalog;              /* starpar  catalog data (split) */
+  struct Catalog *galshape_catalog;             /* galshape catalog data (split) */
 
   unsigned int objID;
@@ -781 +789 @@
   int sorted;                           /* is measure table average-sorted? (NOTE this is an int only because gfits_scan %t requires it) */
   
-  short catflags; /* choices to be loaded */
+  DVOCatFlags catflags; /* choices to be loaded */
 
   /* pointers for data manipulation */
@@ -1106 +1114 @@
 void dvo_lensobj_init (Lensobj *lensobj, int toZero);
 void dvo_starpar_init (StarPar *starpar);
+void dvo_galshape_init (GalShape *galshape);
 
 void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);