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

Timestamp:

Jul 31, 2012, 4:02:00 PM (14 years ago)

Author:

eugene

Message:

add PS1_V4 schema; add set mean fluxes based on stacks; define the primary image ID (based on distance from center or boundary tree) and set mean flux from stacks based on that info; fix (uniquify) psps ID for stack detections; mean fluxes are in Jy; detection fluxes are instrumental counts per second

File:

• trunk/Ohana/src/libdvo/include/dvo.h (modified) (6 diffs)

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

@@ -27 +27 @@
   DVO_FORMAT_PS1_V2,
   DVO_FORMAT_PS1_V3,
+  DVO_FORMAT_PS1_V4,
 } DVOTableFormat;
 
@@ -292 +293 @@
 } DVOTinyValueMode;
 
+# define BOUNDARY_TREE_NAME_LENGTH 128
+
+typedef struct {
+  int FixedGridDEC;           // is the DEC sequence linear?
+  int FixedGridRA;            // in the RA sequence in a zone linear?
+
+  double DEC_origin;
+  double DEC_offset;
+
+  int Nzone;
+  double *RA_origin;
+  double *RA_offset;
+
+  int *Nband;
+  int *NBAND;
+
+  double   **ra;
+  double  **dec;
+  int    **cell;
+  char  ***name;
+} BoundaryTree;
+
 // XXX DROP? // a reduced-subset structure for relastro
 // XXX DROP? typedef struct {
@@ -448 +471 @@
 float PhotCat (Measure *measure);
 float PhotAper (Measure *measure);
+float PhotKron (Measure *measure);
 float PhotSys (Measure *measure, Average *average, SecFilt *secfilt);
 float PhotRel (Measure *measure, Average *average, SecFilt *secfilt);
@@ -456 +480 @@
 float PhotdM (PhotCode *code, Average *average, SecFilt *secfilt);
 
+float PhotAperInst (Measure *measure);
+float PhotKronInst (Measure *measure);
+float PhotKronAve (PhotCode *code, Average *average, SecFilt *secfilt);
+
+float PhotZeroPoint (Measure *measure, Average *average, SecFilt *secfilt);
+float PhotAveFluxPSF (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotAvedFluxPSF (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotAveFluxKron (PhotCode *code, Average *average, SecFilt *secfilt);
+float PhotAvedFluxKron (PhotCode *code, Average *average, SecFilt *secfilt);
+
 float PhotMstdev (PhotCode *code, Average *average, SecFilt *secfilt);
 float PhotM20 (PhotCode *code, Average *average, SecFilt *secfilt);
 float PhotM80 (PhotCode *code, Average *average, SecFilt *secfilt);
 float PhotUCdist (PhotCode *code, Average *average, SecFilt *secfilt);
+unsigned int PhotStackID (PhotCode *code, Average *average, SecFilt *secfilt);
 
 float PhotColorForCode (Average *average, SecFilt *secfilt, Measure *measure, PhotCode *code);
@@ -571 +606 @@
 # include "ps1_v2_defs.h"
 # include "ps1_v3_defs.h"
+# include "ps1_v4_defs.h"
 # include "ps1_ref_defs.h"
 
@@ -648 +684 @@
 int free_tiny_values (Catalog *catalog);
 
+int BoundaryTreeCellCoords (BoundaryTree *tree, int *zone, int *band, double ra, double dec);
+int BoundaryTreeSave(char *filename, BoundaryTree *tree);
+BoundaryTree *BoundaryTreeLoad(char *filename);
+
+void dvo_average_init (Average *average);
+void dvo_secfilt_init (SecFilt *secfilt);
+void dvo_measure_init (Measure *measure);
+
 # endif // DVO_H
-