Changeset 38292 for branches/eam_branches/ipp-20150419/Ohana/src/relphot/include/relphot.h

Timestamp:

May 19, 2015, 7:46:25 AM (11 years ago)

Author:

eugene

Message:

pre-allocate groups of lists for all Nsecfilt values; we will accumulate these lists as we go

File:

• branches/eam_branches/ipp-20150419/Ohana/src/relphot/include/relphot.h (modified) (2 diffs)

branches/eam_branches/ipp-20150419/Ohana/src/relphot/include/relphot.h

@@ -96 +96 @@
 
 typedef struct {
+  double *flxlist;           // list of measure.mag values for a given star
+  double *errlist;            // mag errors for a star
+  double *wgtlist;            // weights to use for mean mags
+} StatDataSet;
+
+typedef struct {
   int Nfew;
   int Ncode;
@@ -105 +111 @@
 
   // 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 *Mpsflist;           // list of measure.mag values for a given star
-  double *dpsflist;           // mag errors for a star
-  double *wpsflist;           // weights to use for mean mags
-
-  double *Maplist;            // ap mags for a star
-  double *daplist;            // ap mags for a star
-  double *waplist;            // ap mags for a star
-
-  double *Mkronlist;          // kron mags for a star
-  double *dkronlist;          // kron mag errors 
-  double *wkronlist;          // kron mag errors 
+  // thread.  The psfData are used in all relphot analyses; the others are only used on
+  // the final output steps.
+
+  StatDataSet  *psfData; // one is allocated for each primary (average) photcode
+  StatDataSet *aperData;
+  StatDataSet *kronData;
 
   double *psfqf_list;         // psfqf for all filters