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

Timestamp:

Jun 6, 2015, 9:10:50 PM (11 years ago)

Author:

eugene

Message:

renamed galshape to galphot for convenience (8 chars in NGALPHOT); fix open / close for galphot

File:

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

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

@@ -54 +54 @@
   DVO_LOAD_STARPAR  = 0x1000,
   DVO_SKIP_STARPAR  = 0x2000,
-  DVO_LOAD_GALSHAPE = 0x4000,
-  DVO_SKIP_GALSHAPE = 0x8000,
+  DVO_LOAD_GALPHOT = 0x4000,
+  DVO_SKIP_GALPHOT = 0x8000,
 } DVOCatFlags;
 
@@ -494 +494 @@
   unsigned short   Nmeasure;             // number of psf measurements
   unsigned short   Nmissing;             // number of missings
-  unsigned short   Ngalshape;            // number of extended measurements
+  unsigned short   Ngalphot;            // number of extended measurements
   uint32_t         measureOffset;        // offset to first psf measurement
   uint32_t         missingOffset;        // offset to first missing obs
@@ -714 +714 @@
   unsigned short   Nlensing;             // number of lensing measurements
   unsigned short   Nlensobj;             // number of lensing measurements
-  unsigned short   Ngalshape;            // number of galshape measurements
+  unsigned short   Ngalphot;            // number of galphot measurements
   int              measureOffset;        // offset to first psf measurement
   int              missingOffset;        // offset to first missing obs
   int              lensingOffset;        // offset to first lensing obs
   int              lensobjOffset;        // offset to mean lensing data
-  int              galshapeOffset;       // offset to extended object entry
+  int              galphotOffset;       // offset to extended object entry
   int              starparOffset;        // offset to stellar parameter data
   float            refColorBlue;         // color of astrometry ref stars
@@ -755 +755 @@
   Lensobj  *lensobj;
   StarPar  *starpar;
-  GalShape *galshape;
+  GalPhot *galphot;
 
   int Nsecfilt;  /* number of secfilt entries for each average entry */
-  off_t Naverage,      Nmeasure,      Nmissing,      Nlensing,      Nlensobj,      Nstarpar,      Ngalshape,      Nsecfilt_mem;  /* current number of each component in memory */
-  off_t Naverage_disk, Nmeasure_disk, Nmissing_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Ngalshape_disk, Nsecfilt_disk; /* current number of each component on disk */
-  off_t Naverage_off,  Nmeasure_off,  Nmissing_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Ngalshape_off,  Nsecfilt_off;  /* index of first loaded data value */
+  off_t Naverage,      Nmeasure,      Nmissing,      Nlensing,      Nlensobj,      Nstarpar,      Ngalphot,      Nsecfilt_mem;  /* current number of each component in memory */
+  off_t Naverage_disk, Nmeasure_disk, Nmissing_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Ngalphot_disk, Nsecfilt_disk; /* current number of each component on disk */
+  off_t Naverage_off,  Nmeasure_off,  Nmissing_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Ngalphot_off,  Nsecfilt_off;  /* index of first loaded data value */
 
   // note that we use these for the full-sky relphot analysis
@@ -782 +782 @@
   struct Catalog *lensobj_catalog;              /* lensobj  catalog data (split) */
   struct Catalog *starpar_catalog;              /* starpar  catalog data (split) */
-  struct Catalog *galshape_catalog;             /* galshape catalog data (split) */
+  struct Catalog *galphot_catalog;              /* galphot catalog data (split) */
 
   unsigned int objID;
@@ -982 +982 @@
 Lensobj *FtableToLensobj   (FTable *ftable, Average *average, off_t *Nlensobj,  DVOCatFormat *format, char nativeOrder);
 StarPar *FtableToStarPar   (FTable *ftable, Average *average, off_t *Nstarpar,  DVOCatFormat *format, char nativeOrder);
-GalShape *FtableToGalShape (FTable *ftable, Average *average, off_t *Ngalshape, DVOCatFormat *format, char nativeOrder);
+GalPhot *FtableToGalPhot (FTable *ftable, Average *average, off_t *Ngalphot, DVOCatFormat *format, char nativeOrder);
 
 int      FtableToImage   (FTable *ftable, Header *theader, DVOCatFormat *format);
@@ -992 +992 @@
 int LensobjToFtable  (FTable *ftable, Lensobj  *lensobj,  off_t Nlensobj,  DVOCatFormat format, int swapFromNative);
 int StarParToFtable  (FTable *ftable, StarPar  *starpar,  off_t Nstarpar,  DVOCatFormat format, int swapFromNative);
-int GalShapeToFtable (FTable *ftable, GalShape *galshape, off_t Ngalshape, DVOCatFormat format, int swapFromNative);
+int GalPhotToFtable (FTable *ftable, GalPhot *galphot, off_t Ngalphot, DVOCatFormat format, int swapFromNative);
 
 int ImageToFtable (FTable *ftable, Header *theader, DVOCatFormat format);
@@ -1128 +1128 @@
 void dvo_lensobj_init (Lensobj *lensobj, int toZero);
 void dvo_starpar_init (StarPar *starpar);
-void dvo_galshape_init (GalShape *galshape);
+void dvo_galphot_init (GalPhot *galphot);
 
 void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);