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

Timestamp:

Jul 24, 2014, 5:10:56 PM (12 years ago)

Author:

eugene

Message:

merge relphot changes from eam_branches/ipp-20140717

Location:

trunk/Ohana

Files:

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

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

@@ -128 +128 @@
   ID_MEAS_BLEND_MEAS     = 0x00000100,  // detection is within radius of multiple objects 
   ID_MEAS_BLEND_OBJ      = 0x00000200,  // multiple detections within radius of object 
-  ID_MEAS_UNDEF_3        = 0x00000400,  // unused 
+  ID_MEAS_WARP_USED      = 0x00000400,  // measurement used to find mean warp photometry
   ID_MEAS_UNDEF_4        = 0x00000800,  // unused 
   ID_MEAS_BLEND_MEAS_X   = 0x00001000,  // detection is within radius of multiple objects across catalogs                    
@@ -383 +383 @@
   char  ***name; // projection cell name
   
-  int NX_SUB;
-  int NY_SUB;
+  float NX_SUB;
+  float NY_SUB;
   double dPix;
 
   double **Xo;
   double **Yo;
-  int **dX;
-  int **dY;
+  float **dX;
+  float **dY;
 } BoundaryTree;
 
@@ -411 +411 @@
   double Do;
   double dPix;
-  int dX;
-  int dY;
-
-  int NX_SUB;
-  int NY_SUB;
+  float dX;
+  float dY;
+
+  float NX_SUB;
+  float NY_SUB;
 
   char *basename;
@@ -710 +710 @@
 float PhotFluxInstErr (Measure *measure, dvoMagClassType class);
 float PhotFluxCatErr (Measure *measure, dvoMagClassType class);
+float PhotFluxAveErr (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source);
 
 float PhotXm (PhotCode *code, Average *average, SecFilt *secfilt);
 float PhotZeroPoint (Measure *measure, Average *average, SecFilt *secfilt);
 
-float PhotMstdev (PhotCode *code, Average *average, SecFilt *secfilt);
+int   PhotNphot (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source);
+float PhotMstdev (PhotCode *code, Average *average, SecFilt *secfilt, dvoMagClassType class, dvoMagSourceType source);
 float PhotMmin (PhotCode *code, Average *average, SecFilt *secfilt);
 float PhotMmax (PhotCode *code, Average *average, SecFilt *secfilt);