diff --git a/openmc/summary.py b/openmc/summary.py index 45742b0c8a..ff6b59d3c7 100644 --- a/openmc/summary.py +++ b/openmc/summary.py @@ -532,7 +532,6 @@ class Summary(object): # If this is a moment, use generic moment order pattern = r'-n$|-pn$|-yn$' score = re.sub(pattern, '-' + moments[j].decode(), score) - tally.add_score(score) # Read filter metadata diff --git a/openmc/tallies.py b/openmc/tallies.py index a8569b7272..cdf6c1f87e 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -1847,7 +1847,7 @@ class Tally(object): data = self.get_values( filters=filters, filter_bins=filter_bins, value='mean') indices = self.get_filter_indices(filters, filter_bins) - self._mean[indices, :, :] = data + self.mean[indices, :, :] = data # Adjust the std_dev data array to relect the new filter order if self.std_dev is not None: @@ -1856,7 +1856,7 @@ class Tally(object): data = self.get_values( filters=filters, filter_bins=filter_bins, value='std_dev') indices = self.get_filter_indices(filters, filter_bins) - self._std_dev[indices, :, :] = data + self.std_dev[indices, :, :] = data def _swap_nuclides(self, nuclide1, nuclide2): """Reverse the ordering of two nuclides in this tally @@ -1913,17 +1913,17 @@ class Tally(object): # Adjust the mean data array to relect the new nuclide order if self.mean is not None: - nuclide1_mean = self._mean[:, nuclide1_index, :].copy() - nuclide2_mean = self._mean[:, nuclide2_index, :].copy() - self._mean[:, nuclide2_index, :] = nuclide1_mean - self._mean[:, nuclide1_index, :] = nuclide2_mean + nuclide1_mean = self.mean[:, nuclide1_index, :].copy() + nuclide2_mean = self.mean[:, nuclide2_index, :].copy() + self.mean[:, nuclide2_index, :] = nuclide1_mean + self.mean[:, nuclide1_index, :] = nuclide2_mean # Adjust the std_dev data array to relect the new nuclide order if self.std_dev is not None: - nuclide1_std_dev = self._std_dev[:, nuclide1_index, :].copy() - nuclide2_std_dev = self._std_dev[:, nuclide2_index, :].copy() - self._std_dev[:, nuclide2_index, :] = nuclide1_std_dev - self._std_dev[:, nuclide1_index, :] = nuclide2_std_dev + nuclide1_std_dev = self.std_dev[:, nuclide1_index, :].copy() + nuclide2_std_dev = self.std_dev[:, nuclide2_index, :].copy() + self.std_dev[:, nuclide2_index, :] = nuclide1_std_dev + self.std_dev[:, nuclide1_index, :] = nuclide2_std_dev def _swap_scores(self, score1, score2): """Reverse the ordering of two scores in this tally @@ -1985,17 +1985,17 @@ class Tally(object): # Adjust the mean data array to relect the new nuclide order if self.mean is not None: - score1_mean = self._mean[:, :, score1_index].copy() - score2_mean = self._mean[:, :, score2_index].copy() - self._mean[:, :, score2_index] = score1_mean - self._mean[:, :, score1_index] = score2_mean + score1_mean = self.mean[:, :, score1_index].copy() + score2_mean = self.mean[:, :, score2_index].copy() + self.mean[:, :, score2_index] = score1_mean + self.mean[:, :, score1_index] = score2_mean # Adjust the std_dev data array to relect the new nuclide order if self.std_dev is not None: - score1_std_dev = self._std_dev[:, :, score1_index].copy() - score2_std_dev = self._std_dev[:, :, score2_index].copy() - self._std_dev[:, :, score2_index] = score1_std_dev - self._std_dev[:, :, score1_index] = score2_std_dev + score1_std_dev = self.std_dev[:, :, score1_index].copy() + score2_std_dev = self.std_dev[:, :, score2_index].copy() + self.std_dev[:, :, score2_index] = score1_std_dev + self.std_dev[:, :, score1_index] = score2_std_dev def __add__(self, other): """Adds this tally to another tally or scalar value.