Skip to content

Commit

Permalink
Remove masked array compress for percentiles
Browse files Browse the repository at this point in the history
When calculating precentiles of values (e.g. track density), the 2-d grid
was passed through ma.compress(), which resulted in a scalar value as
output for the percentile. This threw the PlotInterface.map methods when
trying to create a map of the percentile values.
  • Loading branch information
wcarthur committed Oct 27, 2015
1 parent ed08ece commit a0cba45
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 16 deletions.
9 changes: 3 additions & 6 deletions Evaluate/genesisDensity.py
Original file line number Diff line number Diff line change
Expand Up @@ -255,8 +255,7 @@ def _calculate(self, tracks):

values = np.vstack([xx[ii], yy[ii]])
kernel = gaussian_kde(values, bw_method=.1)
import pdb
#pdb.set_trace()

Z = np.reshape(kernel(positions), self.X.shape)
return Z.T

Expand All @@ -266,10 +265,8 @@ def calculateMeans(self):
self.synHistMean = ma.mean(self.synHist, axis=0)
self.medSynHist = ma.median(self.synHist, axis=0)

self.synHistUpper = percentile(ma.compressed(self.synHist),
per=95, axis=0)
self.synHistLower = percentile(ma.compressed(self.synHist),
per=5, axis=0)
self.synHistUpper = percentile(self.synHist, per=95, axis=0)
self.synHistLower = percentile(self.synHist, per=5, axis=0)

@disableOnWorkers
def historic(self):
Expand Down
10 changes: 4 additions & 6 deletions Evaluate/pressureDistribution.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,6 @@
import sys
import logging

import pdb

import numpy as np
import numpy.ma as ma

Expand Down Expand Up @@ -252,10 +250,10 @@ def calculateMeans(self, synMean, synMin, synMed, synMax, synMinCP):
self.synMin = ma.mean(synMin, axis=0)
self.synMax = ma.mean(synMax, axis=0)

self.synMeanUpper = percentile(ma.compressed(synMean), per=95, axis=0)
self.synMeanLower = percentile(ma.compressed(synMean), per=5, axis=0)
self.synMinUpper = percentile(ma.compressed(synMin), per=95, axis=0)
self.synMinLower = percentile(ma.compressed(synMin), per=5, axis=0)
self.synMeanUpper = percentile(synMean, per=95, axis=0)
self.synMeanLower = percentile(synMean, per=5, axis=0)
self.synMinUpper = percentile(synMin, per=95, axis=0)
self.synMinLower = percentile(synMin, per=5, axis=0)

self.synMinCPDist = np.mean(synMinCP, axis=0)
self.synMinCPLower = percentile(synMinCP, per=5, axis=0)
Expand Down
6 changes: 2 additions & 4 deletions Evaluate/trackDensity.py
Original file line number Diff line number Diff line change
Expand Up @@ -199,10 +199,8 @@ def calculateMeans(self):
self.synHistMean = ma.mean(self.synHist, axis=0)
self.medSynHist = ma.median(self.synHist, axis=0)

self.synHistUpper = percentile(ma.compressed(self.synHist),
per=95, axis=0)
self.synHistLower = percentile(ma.compressed(self.synHist),
per=5, axis=0)
self.synHistUpper = percentile(self.synHist, per=95, axis=0)
self.synHistLower = percentile(self.synHist, per=5, axis=0)

@disableOnWorkers
def historic(self):
Expand Down

0 comments on commit a0cba45

Please sign in to comment.