Changeset 33886 for branches/eam_branches/ipp-20120405/Ohana/src/relphot/include/relphot.h

Timestamp:

May 17, 2012, 9:51:31 AM (14 years ago)

Author:

eugene

Message:

convert liststats to use a statmode element carried by the structure (instead of the global variable); add a weight term to liststats to allow more complex weighting schemes than constant or inverse-error

File:

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

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

@@ -36 +36 @@
 } Mosaic; 
 
+typedef enum {
+  STATS_NONE, 
+  STATS_MEAN, 
+  STATS_MEDIAN, 
+  STATS_WT_MEAN, 
+  STATS_INNER_MEAN, 
+  STATS_INNER_WTMEAN, 
+  STATS_CHI_INNER_MEAN, 
+  STATS_CHI_INNER_WTMEAN
+} ListStatsMode;
+
 typedef struct {
   double median;
@@ -48 +59 @@
   double total;
   int    Nmeas;
+  ListStatsMode statmode;
 } StatType;
 
@@ -245 +257 @@
 void          initialize          PROTO((int argc, char **argv));
 void          initialize_client   PROTO((int argc, char **argv));
-void          initstats           PROTO((char *mode));
-int           liststats           PROTO((double *value, double *dvalue, int N, StatType *stats));
+void          liststats_setmode   PROTO((StatType *stats, char *strmode));
+int           liststats           PROTO((double *value, double *dvalue, double *wvalue, int N, StatType *stats));
 Catalog      *load_catalogs       PROTO((SkyList *skylist, int *Ncatalog, int hostID, char *hostpath));
 Catalog      *load_catalogs_parallel PROTO((SkyList *sky, int *Ncatalog));