Changeset 36918 for branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvo.h

Timestamp:

Jun 19, 2014, 10:36:43 PM (12 years ago)

Author:

eugene

Message:

define lensing & lensobj I/O functions

File:

• branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvo.h (modified) (7 diffs)

branches/eam_branches/ipp-20140610/Ohana/src/libdvo/include/dvo.h

@@ -79 +79 @@
 
 /* catalog values to be loaded */
-# define LOAD_NONE      0x00
-# define LOAD_AVES      0x01
-# define LOAD_MEAS      0x02
-# define LOAD_MISS      0x04
-# define LOAD_SECF      0x08 
-# define SKIP_AVES      0x10
-# define SKIP_MEAS      0x20
-# define SKIP_MISS      0x40
-# define SKIP_SECF      0x80
-
-// # define LOAD_MEAS_META 0x100 -- is this used??
+# define LOAD_NONE      0x000
+# define LOAD_AVES      0x001
+# define LOAD_MEAS      0x002
+# define LOAD_MISS      0x004
+# define LOAD_SECF      0x008 
+# define SKIP_AVES      0x010
+# define SKIP_MEAS      0x020
+# define SKIP_MISS      0x040
+# define SKIP_SECF      0x080
+# define LOAD_LENSING   0x100
+# define LOAD_LENSOBJ   0x200
+# define SKIP_LENSING   0x400
+# define SKIP_LENSOBJ   0x800
 
 /* photometry code types */
@@ -552 +554 @@
 Measure *Measure_PS1_V4alt_ToInternal (Average *ave, Measure_PS1_V4alt *in, off_t Nvalues);
 
+/* for some reason I have merged the set of tables and the file description,
+   so I need to have an internal structure to point to the separate files */
+
 /* a catalog contains this data */
 typedef struct Catalog {
@@ -564 +569 @@
   SecFilt *secfilt;
 
+  // lensing data (optional?)
+  Lensing *lensing;
+  Lensobj *lensobj;
+
   int Nsecfilt;  /* number of secfilt entries for each average entry */
-  off_t Naverage,   Nmeasure,   Nmissing,   Nsecf_mem;  /* current number of each component in memory */
-  off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nsecf_disk; /* current number of each component on disk */
-  off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nsecf_off;  /* index of first loaded data value */
+  off_t Naverage,   Nmeasure,   Nmissing,   Nlensing,      Nlensobj,      Nsecf_mem;  /* current number of each component in memory */
+  off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nsecf_disk; /* current number of each component on disk */
+  off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nlensing_off,  Nlensobj_off,  Nsecf_off;  /* index of first loaded data value */
 
   // note that we use these for the full-sky relphot analysis
@@ -586 +595 @@
   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) */
 
   unsigned int objID;
@@ -790 +801 @@
 Measure *FtableToMeasure (FTable *ftable, Average *average, off_t *Nmeasure, char *format);
 SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format);
+Lensing *FtableToLensing (FTable *ftable, off_t *Nlensing, char *format);
+Lensobj *FtableToLensobj (FTable *ftable, off_t *Nlensobj, char *format);
 int      FtableToImage   (FTable *ftable, Header *theader, char *format);
 
@@ -795 +808 @@
 int MeasureToFtable (FTable *ftable, Average *average, Measure *measure, off_t Nmeasure, char format);
 int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format);
+int LensingToFtable (FTable *ftable, Lensing *lensing, off_t Nlensing, char format);
+int LensobjToFtable (FTable *ftable, Lensobj *lensobj, off_t Nlensobj, char format);
 int ImageToFtable (FTable *ftable, Header *theader, char format);
 int ImageToVtable (VTable *vtable, Header *theader, char format);
@@ -915 +930 @@
 void dvo_measureT_init (MeasureTiny *measure);
 
+void dvo_lensing_init (Lensing *lensing);
+void dvo_lensobj_init (Lensobj *lensobj);
+
 void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);
 void FreeRegionHosts (RegionHostInfo *hosts, int Nhosts);