IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Jun 12, 2015, 9:44:51 PM (11 years ago)
Author:
eugene
Message:

merge changes from trunk

Location:
branches/eam_branches/ipp-20150419/Ohana/src
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branches/ipp-20150419/Ohana/src

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

    r38318 r38447  
    1010
    1111/* DVO table modes */
    12 typedef enum {DVO_MODE_UNDEF, DVO_MODE_RAW, DVO_MODE_MEF, DVO_MODE_SPLIT, DVO_MODE_MYSQL} DVOTableMode;
     12typedef enum {DVO_MODE_UNDEF = 0, DVO_MODE_RAW, DVO_MODE_MEF, DVO_MODE_SPLIT, DVO_MODE_MYSQL} DVOCatMode;
     13
     14/* DVO table modes */
     15typedef enum {DVO_COMPRESS_NONE = 0, DVO_COMPRESS_NONE_1, DVO_COMPRESS_NONE_2, DVO_COMPRESS_AUTO, DVO_COMPRESS_GZIP_1, DVO_COMPRESS_GZIP_2, DVO_COMPRESS_RICE_1} DVOCatCompress; //
    1316
    1417/* DVO table formats */
    1518typedef enum {
    16   DVO_FORMAT_UNDEF,
     19  DVO_FORMAT_UNDEF = 0,
    1720  DVO_FORMAT_INTERNAL,
    1821  DVO_FORMAT_ELIXIR,
    … …  
    3033  DVO_FORMAT_PS1_V4,
    3134  DVO_FORMAT_PS1_V5,
    32 } DVOTableFormat;
     35} DVOCatFormat;
     36
     37typedef enum {DVO_CAT_OPEN_FAIL, DVO_CAT_OPEN_OK, DVO_CAT_OPEN_EMPTY} DVOCatalogOpenModes;
     38
     39/* catalog values to be loaded */
     40typedef enum {
     41  DVO_LOAD_NONE     = 0x0000,
     42  DVO_LOAD_AVERAGE  = 0x0001,
     43  DVO_LOAD_MEASURE  = 0x0002,
     44  DVO_LOAD_MISSING  = 0x0004,
     45  DVO_LOAD_SECFILT  = 0x0008,
     46  DVO_SKIP_AVERAGE  = 0x0010,
     47  DVO_SKIP_MEASURE  = 0x0020,
     48  DVO_SKIP_MISSING  = 0x0040,
     49  DVO_SKIP_SECFILT  = 0x0080,
     50  DVO_LOAD_LENSING  = 0x0100,
     51  DVO_LOAD_LENSOBJ  = 0x0200,
     52  DVO_SKIP_LENSING  = 0x0400,
     53  DVO_SKIP_LENSOBJ  = 0x0800,
     54  DVO_LOAD_STARPAR  = 0x1000,
     55  DVO_SKIP_STARPAR  = 0x2000,
     56  DVO_LOAD_GALPHOT = 0x4000,
     57  DVO_SKIP_GALPHOT = 0x8000,
     58} DVOCatFlags;
    3359
    3460/* image data modes in RegImage */
    3561typedef enum {T_UNDEF = -1, T_NONE, T_OBJECT, T_DARK, T_BIAS, T_FLAT, T_MASK, T_FRINGE, T_SCATTER, T_MODES, T_FRINGEPTS, T_ANY, N_TYPE} ElixirDetrendTypes;
    3662typedef enum {M_UNDEF = -1, M_NONE, M_MEF, M_SPLIT, M_SINGLE, M_CUBE, M_SLICE, M_MODES, N_MODE} ElixirDetrendModes;
    37 
    38 typedef enum {DVO_CAT_OPEN_FAIL, DVO_CAT_OPEN_OK, DVO_CAT_OPEN_EMPTY} DVOCatalogOpenModes;
    3963
    4064// these are used as NAN for types of int values
    … …  
    6286# define IMREG_DIST  0x01 /* image distributed, only imregister-3.0 */
    6387
    64 /* catalog values to be loaded */
    65 # define LOAD_NONE      0x0000
    66 # define LOAD_AVES      0x0001
    67 # define LOAD_MEAS      0x0002
    68 # define LOAD_MISS      0x0004
    69 # define LOAD_SECF      0x0008
    70 # define SKIP_AVES      0x0010
    71 # define SKIP_MEAS      0x0020
    72 # define SKIP_MISS      0x0040
    73 # define SKIP_SECF      0x0080
    74 # define LOAD_LENSING   0x0100
    75 # define LOAD_LENSOBJ   0x0200
    76 # define SKIP_LENSING   0x0400
    77 # define SKIP_LENSOBJ   0x0800
    78 # define LOAD_STARPAR   0x1000
    79 # define SKIP_STARPAR   0x2000
    80 
    8188/* photometry code types */
    8289// # define PHOT_PRI 0x01
    83 # define PHOT_SEC 0x02
    84 # define PHOT_DEP 0x03
    85 # define PHOT_REF 0x04
    86 # define PHOT_ALT 0x05  /* never stored, only for look-ups */
    87 # define PHOT_MAG 0x06  /* generic magnitude; never stored */
     90typedef enum {
     91  PHOT_SEC  = 0x02,
     92  PHOT_DEP  = 0x03,
     93  PHOT_REF  = 0x04,
     94  PHOT_ALT  = 0x05,  /* never stored, only for look-ups */
     95  PHOT_MAG  = 0x06,  /* generic magnitude; never stored */
     96} DVOPhotCodeTypes;
    8897
    8998/* Image.code values -- these values are 32 bit (as of PS1_V1) */
    … …  
    238247  char   lockstate;
    239248  char   mode;          /* what data storage mode is used for disk file? */
    240   char   format;        /* what data format is used for disk file? */
     249  DVOCatFormat format;  /* what data format is used for disk file? */
    241250  char   virtual;       /* is table in ftable or vtable? */
    242   char   swapped;       /* is table in internal byte-order? */
     251  char   nativeOrder;   /* is table in internal byte-order? */
     252  char   scaledValue;   /* is table in internal byte-order? */
    243253} FITS_DB;
    244254
    … …  
    500510  unsigned short   Nmeasure;             // number of psf measurements
    501511  unsigned short   Nmissing;             // number of missings
    502   unsigned short   Nextend;              // number of extended measurements
     512  unsigned short   Ngalphot;            // number of extended measurements
    503513  uint32_t         measureOffset;        // offset to first psf measurement
    504514  uint32_t         missingOffset;        // offset to first missing obs
    … …  
    720730  unsigned short   Nlensing;             // number of lensing measurements
    721731  unsigned short   Nlensobj;             // number of lensing measurements
    722   unsigned short   Nextend;              // number of extended measurements
     732  unsigned short   Ngalphot;            // number of galphot measurements
    723733  int              measureOffset;        // offset to first psf measurement
    724734  int              missingOffset;        // offset to first missing obs
    725735  int              lensingOffset;        // offset to first lensing obs
    726736  int              lensobjOffset;        // offset to mean lensing data
    727   int              extendOffset;         // offset to extended object entry
     737  int              galphotOffset;       // offset to extended object entry
    728738  int              starparOffset;        // offset to stellar parameter data
    729739  float            refColorBlue;         // color of astrometry ref stars
    … …  
    758768
    759769  // lensing data (optional?)
    760   Lensing *lensing;
    761   Lensobj *lensobj;
    762   StarPar *starpar;
     770  Lensing  *lensing;
     771  Lensobj  *lensobj;
     772  StarPar  *starpar;
     773  GalPhot *galphot;
    763774
    764775  int Nsecfilt;  /* number of secfilt entries for each average entry */
    765   off_t Naverage,   Nmeasure,   Nmissing,   Nlensing,      Nlensobj,      Nstarpar,      Nsecf_mem;  /* current number of each component in memory */
    766   off_t Naves_disk, Nmeas_disk, Nmiss_disk, Nlensing_disk, Nlensobj_disk, Nstarpar_disk, Nsecf_disk; /* current number of each component on disk */
    767   off_t Naves_off,  Nmeas_off,  Nmiss_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Nsecf_off;  /* index of first loaded data value */
     776  off_t Naverage,      Nmeasure,      Nmissing,      Nlensing,      Nlensobj,      Nstarpar,      Ngalphot,      Nsecfilt_mem;  /* current number of each component in memory */
     777  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 */
     778  off_t Naverage_off,  Nmeasure_off,  Nmissing_off,  Nlensing_off,  Nlensobj_off,  Nstarpar_off,  Ngalphot_off,  Nsecfilt_off;  /* index of first loaded data value */
    768779
    769780  // note that we use these for the full-sky relphot analysis
    … …  
    781792
    782793  /* pointers to split data files */
    783   struct Catalog *measure_catalog;              /* measure catalog data (split) */
    784   struct Catalog *missing_catalog;              /* missing catalog data (split) */
    785   struct Catalog *secfilt_catalog;              /* secfilt catalog data (split) */
    786   struct Catalog *lensing_catalog;              /* lensing catalog data (split) */
    787   struct Catalog *lensobj_catalog;              /* lensobj catalog data (split) */
    788   struct Catalog *starpar_catalog;              /* starpar catalog data (split) */
     794  struct Catalog *measure_catalog;              /* measure  catalog data (split) */
     795  struct Catalog *missing_catalog;              /* missing  catalog data (split) */
     796  struct Catalog *secfilt_catalog;              /* secfilt  catalog data (split) */
     797  struct Catalog *lensing_catalog;              /* lensing  catalog data (split) */
     798  struct Catalog *lensobj_catalog;              /* lensobj  catalog data (split) */
     799  struct Catalog *starpar_catalog;              /* starpar  catalog data (split) */
     800  struct Catalog *galphot_catalog;              /* galphot catalog data (split) */
    789801
    790802  unsigned int objID;
    … …  
    793805  /* extra catalog information */
    794806  char lockmode;
    795   char catmode;                         /* storage mode (raw, mef, split, mysql) */
    796   char catformat;                       /* storage format (elixir, panstarrs, etc) */
     807  DVOCatMode     catmode;     /* storage mode (raw, mef, split, mysql) */
     808  DVOCatFormat   catformat;                     /* storage format (elixir, panstarrs, etc) */
     809  DVOCatCompress catcompress;                   // output compress mode
     810  DVOCatFlags    catflags;                      /* choices to be loaded */
     811 
    797812  int sorted;                           /* is measure table average-sorted? (NOTE this is an int only because gfits_scan %t requires it) */
    798  
    799   short catflags; /* choices to be loaded */
     813
    800814
    801815  /* pointers for data manipulation */
    … …  
    946960int dvo_catalog_save_complete (Catalog *catalog, char VERBOSE);
    947961int dvo_catalog_update (Catalog *catalog, char VERBOSE);
    948 int dvo_catalog_catformat (char *catformat);
    949 int dvo_catalog_catmode (char *catmode);
     962DVOCatFormat dvo_catalog_catformat (char *catformat);
     963DVOCatMode dvo_catalog_catmode (char *catmode);
     964DVOCatCompress dvo_catalog_catcompress (char *catcompress);
     965char *dvo_catalog_compress_string (DVOCatCompress catcompress);
    950966void dvo_catalog_test (Catalog *catalog, int halt);
    951967
    … …  
    974990int WriteRawSecFilt (FILE *f, SecFilt *secfilt, off_t Nsecfilt, char format);
    975991
    976 DVOTableFormat FtableGetFormat (FTable *ftable);
    977 
    978 Average *FtableToAverage (FTable *ftable, off_t *Naverage, char *format, SecFilt **primary);
    979 Measure *FtableToMeasure (FTable *ftable, Average *average, off_t *Nmeasure, char *format);
    980 SecFilt *FtableToSecFilt (FTable *ftable, off_t *Nsecfilt, char *format);
    981 Lensing *FtableToLensing (FTable *ftable, off_t *Nlensing, char *format);
    982 Lensobj *FtableToLensobj (FTable *ftable, off_t *Nlensobj, char *format);
    983 StarPar *FtableToStarPar (FTable *ftable, off_t *Nstarpar, char *format);
    984 int      FtableToImage   (FTable *ftable, Header *theader, char *format);
    985 
    986 int AverageToFtable (FTable *ftable, Average *average, off_t Naverage, char format, SecFilt *primary);
    987 int MeasureToFtable (FTable *ftable, Average *average, Measure *measure, off_t Nmeasure, char format);
    988 int SecFiltToFtable (FTable *ftable, SecFilt *secfilt, off_t Nsecfilt, char format);
    989 int LensingToFtable (FTable *ftable, Lensing *lensing, off_t Nlensing, char format);
    990 int LensobjToFtable (FTable *ftable, Lensobj *lensobj, off_t Nlensobj, char format);
    991 int StarParToFtable (FTable *ftable, StarPar *starpar, off_t Nstarpar, char format);
    992 int ImageToFtable (FTable *ftable, Header *theader, char format);
    993 int ImageToVtable (VTable *vtable, Header *theader, char format);
     992DVOCatFormat FtableGetFormat (FTable *ftable);
     993
     994Average *FtableToAverage   (FTable *ftable, off_t *Naverage,  DVOCatFormat *format, SecFilt **primary, char nativeOrder);
     995
     996Measure *FtableToMeasure   (FTable *ftable, Average *average, off_t *Nmeasure,  DVOCatFormat *format, char nativeOrder);
     997Missing *FtableToMissing   (FTable *ftable, Average *average, off_t *Nmissing,  DVOCatFormat *format, char nativeBytes);
     998SecFilt *FtableToSecFilt   (FTable *ftable, Average *average, off_t *Nsecfilt,  DVOCatFormat *format, char nativeOrder);
     999Lensing *FtableToLensing   (FTable *ftable, Average *average, off_t *Nlensing,  DVOCatFormat *format, char nativeOrder);
     1000Lensobj *FtableToLensobj   (FTable *ftable, Average *average, off_t *Nlensobj,  DVOCatFormat *format, char nativeOrder);
     1001StarPar *FtableToStarPar   (FTable *ftable, Average *average, off_t *Nstarpar,  DVOCatFormat *format, char nativeOrder);
     1002GalPhot *FtableToGalPhot (FTable *ftable, Average *average, off_t *Ngalphot, DVOCatFormat *format, char nativeOrder);
     1003
     1004int      FtableToImage   (FTable *ftable, Header *theader, DVOCatFormat *format);
     1005
     1006int MeasureToFtable  (FTable *ftable, Average  *average,  Measure *measure, off_t Nmeasure, DVOCatFormat format, int swapFromNative);
     1007int AverageToFtable  (FTable *ftable, Average  *average,  off_t Naverage,  DVOCatFormat format, SecFilt *primary, int swapFromNative);
     1008int SecFiltToFtable  (FTable *ftable, SecFilt  *secfilt,  off_t Nsecfilt,  DVOCatFormat format, int swapFromNative);
     1009int LensingToFtable  (FTable *ftable, Lensing  *lensing,  off_t Nlensing,  DVOCatFormat format, int swapFromNative);
     1010int LensobjToFtable  (FTable *ftable, Lensobj  *lensobj,  off_t Nlensobj,  DVOCatFormat format, int swapFromNative);
     1011int StarParToFtable  (FTable *ftable, StarPar  *starpar,  off_t Nstarpar,  DVOCatFormat format, int swapFromNative);
     1012int GalPhotToFtable (FTable *ftable, GalPhot *galphot, off_t Ngalphot, DVOCatFormat format, int swapFromNative);
     1013
     1014int ImageToFtable (FTable *ftable, Header *theader, DVOCatFormat format);
     1015int ImageToVtable (VTable *vtable, Header *theader, DVOCatFormat format);
    9941016
    9951017# include "loneos_defs.h"
    … …  
    10231045int gfits_table_set_Image (FTable *ftable);
    10241046int gfits_table_mkheader_Image (Header *header);
    1025 Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *swapped);
     1047Image *gfits_table_get_Image (FTable *ftable, off_t *Ndata, char *scaledValue, char *nativeOrder);
    10261048
    10271049/* flatcorr APIs */
    … …  
    10871109void InitHost (HostInfo *host);
    10881110
    1089 HostTableGroup *HostTableGroups (HostTable *table, int *ngroups);
     1111HostTableGroup *HostTableGroupsUniqueMachines (HostTable *table, int *ngroups);
     1112HostTableGroup *HostTableGroupsMaxNumber (HostTable *table, int *ngroups, int Nmax);
     1113
    10901114int HostTableGroupWaitJobsGetIO (HostTableGroup *table, char *file, int lineno, int VERBOSE);
    10911115
    … …  
    11241148void dvo_lensobj_init (Lensobj *lensobj, int toZero);
    11251149void dvo_starpar_init (StarPar *starpar);
     1150void dvo_galphot_init (GalPhot *galphot);
    11261151
    11271152void InitRegionHosts (RegionHostInfo *hosts, int Nhosts, int NHOSTS);
Note: See TracChangeset for help on using the changeset viewer.