Changeset 40477 for branches/czw_branch/20170908/Ohana/src/libdvo/include/dvo.h

Timestamp:

Jun 27, 2018, 3:20:35 PM (8 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/czw_branch/20170908/Ohana

Files:

• . (modified) (1 prop)
• src/libdvo/include/dvo.h (modified) (5 diffs)

branches/czw_branch/20170908/Ohana/src/libdvo/include/dvo.h

@@ -33 +33 @@
   DVO_FORMAT_PS1_V4,
   DVO_FORMAT_PS1_V5,
+  DVO_FORMAT_PS1_V6,
   DVO_FORMAT_PS1_V5_LOAD,
 } DVOCatFormat;
@@ -220 +221 @@
 /* Secfilt.flags values -- these values are 32 bit (as of PS1_V1) */
 typedef enum {
-  ID_SECF_STAR_FEW      = 0x00000001, // used within relphot: skip star
-  ID_SECF_STAR_POOR     = 0x00000002, // used within relphot: skip star
-  ID_SECF_USE_SYNTH     = 0x00000004, // synthetic photometry used in average measurement
-  ID_SECF_USE_UBERCAL   = 0x00000008, // ubercal photometry used in average measurement
-  ID_SECF_HAS_PS1       = 0x00000010, // PS1 photometry used in average measurement
-  ID_SECF_HAS_PS1_STACK = 0x00000020, // PS1 stack photometry exists
-  ID_SECF_HAS_TYCHO     = 0x00000040, // Tycho photometry used for synth mags
-  ID_SECF_FIX_SYNTH     = 0x00000080, // synth mags repaired with zpt map
-  ID_SECF_RANK_0        = 0x00000100, // average magnitude uses rank 0 values
-  ID_SECF_RANK_1        = 0x00000200, // average magnitude uses rank 1 values
-  ID_SECF_RANK_2        = 0x00000400, // average magnitude uses rank 2 values
-  ID_SECF_RANK_3        = 0x00000800, // average magnitude uses rank 3 values
-  ID_SECF_RANK_4        = 0x00001000, // average magnitude uses rank 4 values
-  ID_SECF_OBJ_EXT_PSPS  = 0x00002000, // In PSPS ID_SECF_OBJ_EXT is moved here so it fits within 16 bits 
-  ID_SECF_STACK_PRIMARY = 0x00004000, // PS1 stack photometry comes from primary skycell
-  ID_SECF_STACK_BESTDET = 0x00008000, // PS1 stack best measurement is a detection (not forced)
-  ID_SECF_STACK_PRIMDET = 0x00010000, // PS1 stack primary measurement is a detection (not forced)
-
-  ID_SECF_HAS_SDSS      = 0x00100000, // this photcode has SDSS photometry
-  ID_SECF_HAS_HSC       = 0x00200000, // this photcode has HSC  photometry
-  ID_SECF_HAS_CFH       = 0x00400000, // this photcode has CFH  photometry (mostly Megacam)
-  ID_SECF_HAS_DES       = 0x00800000, // this photcode has DES  photometry
-
-  ID_SECF_OBJ_EXT       = 0x01000000, // extended in this band
-
-  ID_SECF_CHIP_FLAGS    = 0x01003f1f, // all chip-related bits (used to reset the correct bits only)
-  ID_SECF_STACK_FLAGS   = 0x00004020, // all stack-related bits (
+  ID_SECF_STAR_FEW               = 0x00000001, // used within relphot: skip star
+  ID_SECF_STAR_POOR              = 0x00000002, // used within relphot: skip star
+  ID_SECF_USE_SYNTH              = 0x00000004, // synthetic photometry used in average measurement
+  ID_SECF_USE_UBERCAL            = 0x00000008, // ubercal photometry used in average measurement
+  ID_SECF_HAS_PS1                = 0x00000010, // PS1 photometry used in average measurement
+  ID_SECF_HAS_PS1_STACK          = 0x00000020, // PS1 stack photometry exists
+  ID_SECF_HAS_TYCHO              = 0x00000040, // Tycho photometry used for synth mags
+  ID_SECF_FIX_SYNTH              = 0x00000080, // synth mags repaired with zpt map
+  ID_SECF_RANK_0                 = 0x00000100, // average magnitude uses rank 0 values
+  ID_SECF_RANK_1                 = 0x00000200, // average magnitude uses rank 1 values
+  ID_SECF_RANK_2                 = 0x00000400, // average magnitude uses rank 2 values
+  ID_SECF_RANK_3                 = 0x00000800, // average magnitude uses rank 3 values
+  ID_SECF_RANK_4                 = 0x00001000, // average magnitude uses rank 4 values
+  ID_SECF_OBJ_EXT_PSPS           = 0x00002000, // In PSPS ID_SECF_OBJ_EXT is moved here so it fits within 16 bits 
+  ID_SECF_STACK_PRIMARY          = 0x00004000, // PS1 stack photometry includes a primary skycell
+  ID_SECF_STACK_BESTDET          = 0x00008000, // PS1 stack best measurement is a detection (not forced)
+  ID_SECF_STACK_PRIMDET          = 0x00010000, // PS1 stack primary measurement is a detection (not forced)
+  ID_SECF_STACK_PRIMARY_MULTIPLE = 0x00020000, // PS1 stack object has multiple primary measurements
+
+  ID_SECF_HAS_SDSS               = 0x00100000, // this photcode has SDSS photometry
+  ID_SECF_HAS_HSC                = 0x00200000, // this photcode has HSC  photometry
+  ID_SECF_HAS_CFH                = 0x00400000, // this photcode has CFH  photometry (mostly Megacam)
+  ID_SECF_HAS_DES                = 0x00800000, // this photcode has DES  photometry
+
+  ID_SECF_OBJ_EXT                = 0x01000000, // extended in this band
+
+  ID_SECF_CHIP_FLAGS             = 0x01003f1f, // all chip-related bits (used to reset the correct bits only)
+  ID_SECF_STACK_FLAGS            = 0x0003c020, // all stack-related bits (
 } DVOSecfiltFlags;
 
@@ -501 +503 @@
   double         R;
   double         D;
-  float          M;
-  float          Mcal;
+  float          M; // change to Mpsf eventually to disambiguate
+  float          Mkron;
+  float          McalPSF;
+  float          McalAPER;
   float          Mflat;
   float          dM;
@@ -1073 +1077 @@
 # include "ps1_v4_defs.h"
 # include "ps1_v5_defs.h"
+# include "ps1_v6_defs.h"
 # include "ps1_v5_ld_defs.h"
 # include "ps1_ref_defs.h"
@@ -1267 +1272 @@
 # undef LENSFIELD
 
-# define GALPHOT_FIELD(NAME, VALUE) float GalphotValue_##NAME (PhotCode *code, dvoMagClassType class, GalPhot *galphot, int Ngalphot)
-
-GALPHOT_FIELD(GAL_MAG,         mag);           
-GALPHOT_FIELD(GAL_MAG_ERR,     magErr);    
-GALPHOT_FIELD(GAL_MAJ,         majorAxis);             
-GALPHOT_FIELD(GAL_MAJ_ERR,     majorAxisErr);
-GALPHOT_FIELD(GAL_MIN,         minorAxis);             
-GALPHOT_FIELD(GAL_MIN_ERR,     minorAxisErr);    
-GALPHOT_FIELD(GAL_THETA,       theta);      
-GALPHOT_FIELD(GAL_THETA_ERR,   thetaErr);  
-GALPHOT_FIELD(GAL_INDEX,       index);      
-GALPHOT_FIELD(GAL_CHISQ,       chisq);      
-GALPHOT_FIELD(GAL_NPIX,        Npix);       
-GALPHOT_FIELD(GAL_FLAGS,       flags);       
-GALPHOT_FIELD(GAL_TYPE,        modelType);       
+# define GALPHOT_FIELD(NAME, VALUE, TYPE, DEFAULT) TYPE GalphotValue_##NAME (PhotCode *code, dvoMagClassType class, GalPhot *galphot, int Ngalphot);
+
+//GALPHOT_FIELD(GAL_MAG,               mag);           
+//GALPHOT_FIELD(GAL_MAG_ERR,     magErr);    
+//GALPHOT_FIELD(GAL_MAJ,               majorAxis);             
+//GALPHOT_FIELD(GAL_MAJ_ERR,     majorAxisErr);
+//GALPHOT_FIELD(GAL_MIN,               minorAxis);             
+//GALPHOT_FIELD(GAL_MIN_ERR,     minorAxisErr);    
+//GALPHOT_FIELD(GAL_THETA,       theta);      
+//GALPHOT_FIELD(GAL_THETA_ERR,   thetaErr);  
+//GALPHOT_FIELD(GAL_INDEX,       index);      
+//GALPHOT_FIELD(GAL_CHISQ,       chisq);      
+//GALPHOT_FIELD(GAL_NPIX,        Npix);       
+//GALPHOT_FIELD(GAL_FLAGS,       flags);       
+//GALPHOT_FIELD(GAL_TYPE,        modelType);       
+
+GALPHOT_FIELD(GAL_MAG,         mag,          float, NAN) 
+GALPHOT_FIELD(GAL_MAG_ERR,     magErr,       float, NAN) 
+GALPHOT_FIELD(GAL_MAJ,         majorAxis,    float, NAN) 
+GALPHOT_FIELD(GAL_MAJ_ERR,     majorAxisErr, float, NAN)
+GALPHOT_FIELD(GAL_MIN,         minorAxis,    float, NAN) 
+GALPHOT_FIELD(GAL_MIN_ERR,     minorAxisErr, float, NAN) 
+GALPHOT_FIELD(GAL_THETA,       theta,        float, NAN) 
+GALPHOT_FIELD(GAL_THETA_ERR,   thetaErr,     float, NAN) 
+GALPHOT_FIELD(GAL_INDEX,       index,        float, NAN)      
+GALPHOT_FIELD(GAL_CHISQ,       chisq,        float, NAN)      
+GALPHOT_FIELD(GAL_NPIX,        Npix,         float, NAN)       
+
+GALPHOT_FIELD(GAL_TYPE,        modelType,    short, 0)       
+
+GALPHOT_FIELD(GAL_FLAGS,       flags,        unsigned int, 0)       
+GALPHOT_FIELD(GAL_OBJ_ID,      objID,        unsigned int, 0)       
+GALPHOT_FIELD(GAL_CAT_ID,      catID,        unsigned int, 0)       
+GALPHOT_FIELD(GAL_DET_ID,      detID,        unsigned int, 0)       
+GALPHOT_FIELD(GAL_IMAGE_ID,    imageID,      unsigned int, 0)       
 
 # undef GALPHOT_FIELD