Changeset 41555 for trunk/Ohana/src/relphot/src/liststats.c
- Timestamp:
- Apr 24, 2021, 2:28:09 PM (5 years ago)
- File:
-
- 1 edited
-
trunk/Ohana/src/relphot/src/liststats.c (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/Ohana/src/relphot/src/liststats.c
r41462 r41555 26 26 stats->Upper80 = NAN; 27 27 stats->Lower20 = NAN; 28 stats->Upper90 = NAN; 29 stats->Lower10 = NAN; 28 30 stats->total = NAN; 29 31 stats->Nmeas = 0; … … 49 51 if (N < 1) return (FALSE); 50 52 53 int N90 = MIN (N-1, 0.9*N); 51 54 int N80 = MIN (N-1, 0.8*N); 52 55 int N20 = MAX (0, 0.2*N); 56 int N10 = MAX (0, 0.1*N); 53 57 54 58 if (weight) { … … 68 72 stats[0].Upper80 = value[N80]; 69 73 stats[0].Lower20 = value[N20]; 74 stats[0].Upper90 = value[N90]; 75 stats[0].Lower10 = value[N10]; 70 76 71 77 switch (stats->statmode) { … … 116 122 WeightedMean |= (stats->statmode == STATS_INNER_WTMEAN); 117 123 WeightedMean |= (stats->statmode == STATS_CHI_INNER_WTMEAN); 124 if (!dvalue) WeightedMean = FALSE; // warn the user? 118 125 119 126 /* calculating the per-star offset based on the desired weighting scheme */ … … 137 144 M += value[i] * weight[i]; 138 145 W += weight[i]; 139 dM += SQ (weight[i] * dvalue[i]);146 dM += dvalue ? SQ (weight[i] * dvalue[i]) : 0.0; 140 147 R += weight[i]; 141 148 Nm += 1.0; 142 149 } 143 150 Mo = M / W; 144 dMo = sqrt (dM) / R;151 dMo = dvalue ? sqrt (dM) / R : NAN; 145 152 } 146 153 } else { … … 159 166 for (i = ks; i < ke; i++) { 160 167 M += value[i]; 161 dM += SQ (dvalue[i]);168 dM += dvalue ? SQ (dvalue[i]) : 0.0; 162 169 Nm += 1.0; 163 170 } 164 171 Mo = M / Nm; 165 dMo = sqrt (dM) / Nm;172 dMo = dvalue ? sqrt (dM) / Nm : NAN; 166 173 } 167 174 }
Note:
See TracChangeset
for help on using the changeset viewer.
