From b504ae47777b3f0923140ae9a29d92eba216f206 Mon Sep 17 00:00:00 2001 From: Paul Romano Date: Sun, 18 Nov 2012 14:09:58 -0500 Subject: [PATCH] Change n_score_bins and n_filter_bins to total_score_bins and total_filter bins in Python scripts. --- src/utils/statepoint.py | 8 ++++---- src/utils/statepoint_cmp.py | 4 ++-- src/utils/statepoint_histogram.py | 2 +- src/utils/statepoint_meshplot.py | 8 ++++++-- src/utils/tally_conv.py | 10 +++++----- 5 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/utils/statepoint.py b/src/utils/statepoint.py index 0b1f314935..ccdfca6a7b 100644 --- a/src/utils/statepoint.py +++ b/src/utils/statepoint.py @@ -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 diff --git a/src/utils/statepoint_cmp.py b/src/utils/statepoint_cmp.py index 624413a2ad..52ac000dab 100755 --- a/src/utils/statepoint_cmp.py +++ b/src/utils/statepoint_cmp.py @@ -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) diff --git a/src/utils/statepoint_histogram.py b/src/utils/statepoint_histogram.py index 4cde3b5215..e287cc8bb6 100755 --- a/src/utils/statepoint_histogram.py +++ b/src/utils/statepoint_histogram.py @@ -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): diff --git a/src/utils/statepoint_meshplot.py b/src/utils/statepoint_meshplot.py index e75f881e3d..4fa21b6fdf 100755 --- a/src/utils/statepoint_meshplot.py +++ b/src/utils/statepoint_meshplot.py @@ -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 diff --git a/src/utils/tally_conv.py b/src/utils/tally_conv.py index 9741a5db31..f6f9ec5e41 100755 --- a/src/utils/tally_conv.py +++ b/src/utils/tally_conv.py @@ -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)]