Changeset 40463 for trunk/Ohana/src/libdvo/include/dvo.h

Timestamp:

Jun 27, 2018, 1:15:19 PM (8 years ago)

Author:

eugene

Message:

add hooks to query GALPHOT table in avextract, mextract

File:

• trunk/Ohana/src/libdvo/include/dvo.h (modified) (1 diff)

trunk/Ohana/src/libdvo/include/dvo.h

@@ -1272 +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