Changeset 39125 for trunk/Ohana/src/libdvo

Timestamp:

Nov 13, 2015, 5:19:12 AM (11 years ago)

Author:

eugene

Message:

adding flags to galphot

Location:

trunk/Ohana/src/libdvo

Files:

• include/dvo.h (modified) (1 diff)
• src/dvo_catalog.c (modified) (1 diff)
• src/dvo_convert_PS1_V5.c (modified) (3 diffs)
• src/dvo_photcode_ops.c (modified) (1 diff)

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

@@ -138 +138 @@
   ID_MEAS_PHOTOM_KRON    = 0x00400000,  // this measurement is used for the mean kron mag
 } DVOMeasureFlags;
+
+typedef enum {
+  ID_GALPHOT_FAIL_FIT       = 0x00000001, // fit failed to converge or was degenerate
+  ID_GALPHOT_TOO_FEW        = 0x00000002, // not enough points to fit the model
+  ID_GALPHOT_OUT_OF_RANGE   = 0x00000004, // fit minimum too far outside data range
+  ID_GALPHOT_BAD_ERROR      = 0x00000008, // invalid error (nan or inf)
+} DVOGalphotFlags;
 
 // XXX we used these names previously in markstar: replace with ID_MEAS_ARTIFACT

trunk/Ohana/src/libdvo/src/dvo_catalog.c

@@ -552 +552 @@
   galphot->imageID = -1;
   galphot->averef  = 0;
+  galphot->flags   = 0;
 
   galphot->photcode = 0;

trunk/Ohana/src/libdvo/src/dvo_convert_PS1_V5.c

@@ -1031 +1031 @@
     out[i].imageID       = in[i].imageID;
     out[i].averef        = in[i].averef;
+    out[i].flags         = in[i].flags;
     out[i].photcode      = in[i].photcode;
     out[i].modelType     = in[i].modelType;
@@ -1065 +1066 @@
     out[i].imageID       = in[i].imageID;
 //  out[i].averef        = in[i].averef;
+//  out[i].flags         = in[i].flags;
     out[i].photcode      = in[i].photcode;
     out[i].modelType     = in[i].modelType;
@@ -1097 +1099 @@
     out[i].imageID       = in[i].imageID;
     out[i].averef        = in[i].averef;
+    out[i].flags         = in[i].flags;
     out[i].photcode      = in[i].photcode;
     out[i].modelType     = in[i].modelType;

trunk/Ohana/src/libdvo/src/dvo_photcode_ops.c

@@ -1944 +1944 @@
   }
 
-GALPHOT_FIELD(GAL_MAG,         mag)            
-GALPHOT_FIELD(GAL_MAG_ERR,     magErr)    
-GALPHOT_FIELD(GAL_MAJ,         majorAxis)              
+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_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)