Changeset 37389 for branches/eam_branches/ipp-20140904/Ohana/src/libdvo/include/dvo.h

Timestamp:

Sep 12, 2014, 9:24:36 AM (12 years ago)

Author:

eugene

Message:

adding stellar params; associating image maps

File:

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

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

@@ -653 +653 @@
   Lensobj *lensobj;
 
+  StarPar *starpar;
+
   int Nsecfilt;  /* number of secfilt entries for each average entry */
-  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 */
+  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 */
 
   // note that we use these for the full-sky relphot analysis
@@ -677 +679 @@
   struct Catalog *lensing_catalog;              /* lensing catalog data (split) */
   struct Catalog *lensobj_catalog;              /* lensobj catalog data (split) */
+  struct Catalog *starpar_catalog;              /* starpar catalog data (split) */
 
   unsigned int objID;
@@ -869 +872 @@
 Lensing *FtableToLensing (FTable *ftable, off_t *Nlensing, char *format);
 Lensobj *FtableToLensobj (FTable *ftable, off_t *Nlensobj, char *format);
+StarPar *FtableToStarPar (FTable *ftable, off_t *Nstarpar, char *format);
 int      FtableToImage   (FTable *ftable, Header *theader, char *format);
 
@@ -876 +880 @@
 int LensingToFtable (FTable *ftable, Lensing *lensing, off_t Nlensing, char format);
 int LensobjToFtable (FTable *ftable, Lensobj *lensobj, off_t Nlensobj, char format);
+int StarParToFtable (FTable *ftable, StarPar *starpar, off_t Nstarpar, char format);
 int ImageToFtable (FTable *ftable, Header *theader, char format);
 int ImageToVtable (VTable *vtable, Header *theader, char format);
@@ -1003 +1008 @@
 void dvo_lensobj_init (Lensobj *lensobj, int toZero);
 
+void dvo_starpar_init (StarPar *starpar);
+
 void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);
 void FreeRegionHosts (RegionHostInfo *hosts, int Nhosts);