Changeset 34844 for trunk/Ohana/src/relphot/include/relphot.h

Timestamp:

Dec 18, 2012, 10:04:35 AM (14 years ago)

Author:

eugene

Message:

merging changes from eam_branches/ipp-20121130

Location:

trunk/Ohana

Files:

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

trunk/Ohana/src/relphot/include/relphot.h

@@ -63 +63 @@
 
 typedef struct {
+  int Nfew;
+  int Ncode;
+  int Nsys;
+  int Nbad;
+  int Ncal;
+  int Nmos;
+  int Ngrid;
+
+  // NOTE: the following arrays are (possibly) pre-allocated and carried down to each
+  // thread.  The first 3 (list, dlist, wlist) are used in all relphot analyses; the
+  // others are only used on the final output steps.
+
+  double *list;               // list of measure.mag values for a given star
+  double *dlist;              // mag errors for a star
+  double *wlist;              // weights to use for mean mags
+  double *aplist;             // ap mags for a star
+  double *kronlist;           // kron mags for a star
+  double *dkronlist;          // kron mag errors 
+
+  double *psfqf_list;         // psfqf for all filters
+  double *psfqfperf_list;     // psfqfperf for all filters
+  double *stargal_list;       // stargal for all filters
+
+  StatType stats;
+  StatType apstats;
+  StatType kronstats;
+} SetMrelInfo;
+
+typedef struct {
   AverageTiny *average;       // array of (minimal) average data
   MeasureTiny *measure;       // array of (minimal) measure data 
@@ -113 +142 @@
 
 char        *BOUNDARY_TREE;
+
+int SET_MREL_VERSION;
 
 double MAG_LIM;
@@ -239 +270 @@
 Coords       *getCoords           PROTO((off_t meas, int cat));
 off_t         getImageEntry       PROTO((off_t meas, int cat));
+
+float         getMcal_alt         PROTO((off_t meas, int cat, FlatCorrectionTable *flatcorr, float Xccd, float Yccd));
 float         getMcal             PROTO((off_t meas, int cat, FlatCorrectionTable *flatcorr, Catalog *catalog));
 float         getMflat            PROTO((off_t meas, int cat, FlatCorrectionTable *flatcorr, Catalog *catalog));
@@ -348 +381 @@
 int load_tree (char *treefile);
 int BoundaryTreePrimaryCell (char *primaryCellName, double ra, double dec);
+
+int print_measure_set_alt (Average *average, SecFilt *secfilt, Measure *measure);
+int setMrel_catalog_alt (Catalog *catalog, int Nc, int pass, FlatCorrectionTable *flatcorr, SetMrelInfo *results, int Nsecfilt);
+int setMrelAverageExposure (off_t meas, int cat, int pass, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, AverageTiny *averageT, SecFilt *secfilt, Measure *measure, MeasureTiny *measureT, off_t *found);
+int setMrelAverageStack (off_t meas, int cat, FlatCorrectionTable *flatcorr, SetMrelInfo *results, Average *average, SecFilt *secfilt, Measure *measure, char *primaryCell);
+int setGlobalObjStats (Average *average, Measure *measure);
+
+void SetMrelInfoInit (SetMrelInfo *results, int allocLists);