Change n_score_bins and n_filter_bins to total_score_bins and total_filter bins in Python scripts.

This commit is contained in:
Paul Romano 2012-11-18 14:09:58 -05:00
parent f18e68caaa
commit b504ae4777
5 changed files with 18 additions and 14 deletions

View file

@ -149,8 +149,8 @@ class StatePoint(BinaryFile):
t.n_realizations = self._get_int()[0]
# Read sizes of tallies
t.n_score_bins = self._get_int()[0]
t.n_filter_bins = self._get_int()[0]
t.total_score_bins = self._get_int()[0]
t.total_filter_bins = self._get_int()[0]
# Read number of filters
n_filters = self._get_int()[0]
@ -213,9 +213,9 @@ class StatePoint(BinaryFile):
if tallies_present:
for t in self.tallies:
n = t.n_score_bins * t.n_filter_bins
n = t.total_score_bins * t.total_filter_bins
t.values = np.array(self._get_double(2*n))
t.values.shape = (t.n_filter_bins, t.n_score_bins, 2)
t.values.shape = (t.total_filter_bins, t.total_score_bins, 2)
# Indicate that tally values have been read
self._values = True

View file

@ -56,8 +56,8 @@ for m1, m2 in zip(sp1.meshes, sp2.meshes):
assert len(sp1.tallies) == len(sp2.tallies)
for t1, t2 in zip(sp1.tallies, sp2.tallies):
# Compare size of tallies
assert t1.n_score_bins == t2.n_score_bins
assert t1.n_filter_bins == t2.n_filter_bins
assert t1.total_score_bins == t2.total_score_bins
assert t1.total_filter_bins == t2.total_filter_bins
# Compare filters
assert len(t1.filters) == len(t2.filters)

View file

@ -45,7 +45,7 @@ for i, t in enumerate(sp.tallies):
uncertainties = []
nonzero = []
n_bins = t.n_score_bins * t.n_filter_bins
n_bins = t.total_score_bins * t.total_filter_bins
# Loop over filter/score bins
for j in range(n_bins):

View file

@ -41,12 +41,16 @@ for t in sp.tallies:
n = t.n_realizations
t_value = scipy.stats.t.ppf(0.975, n - 1)
n_bins = t.n_score_bins * t.n_filter_bins
n_bins = t.total_score_bins * t.total_filter_bins
# Check for mesh
if 'mesh' not in t.filters:
continue
# Get Mesh object
m = sp.meshes[t.filters['mesh'].bins[0] - 1]
nx, ny, nz = m.dimension
ns = t.n_score_bins * t.n_filter_bins / (nx*ny*nz)
ns = t.total_score_bins * t.total_filter_bins / (nx*ny*nz)
assert n_bins == nx*ny*nz*ns

View file

@ -108,16 +108,16 @@ for i_batch in range(len(files)):
active_batches[i_batch] = n
# Resize the 2nd dimension
mean[i_batch][i_tally] = [None for x in range(t.n_filter_bins)]
uncert[i_batch][i_tally] = [None for x in range(t.n_filter_bins)]
scoreType[i_batch][i_tally] = [None for x in range(t.n_filter_bins)]
mean[i_batch][i_tally] = [None for x in range(t.total_filter_bins)]
uncert[i_batch][i_tally] = [None for x in range(t.total_filter_bins)]
scoreType[i_batch][i_tally] = [None for x in range(t.total_filter_bins)]
for i_filter in range(t.n_filter_bins):
for i_filter in range(t.total_filter_bins):
# Resize the 3rd dimension
mean[i_batch][i_tally][i_filter] = [None for x in range(t.n_nuclides)]
uncert[i_batch][i_tally][i_filter] = [None for x in range(t.n_nuclides)]
scoreType[i_batch][i_tally][i_filter] = [None for x in range(t.n_nuclides)]
print(t.n_filter_bins,t.n_nuclides)
print(t.total_filter_bins,t.n_nuclides)
for i_nuclide in range(t.n_nuclides):
mean[i_batch][i_tally][i_filter][i_nuclide] = \
[None for x in range(t.n_scores)]