diff --git a/openmc/cross.py b/openmc/cross.py index 45c7ce2d8..16b8bd573 100644 --- a/openmc/cross.py +++ b/openmc/cross.py @@ -1,29 +1,29 @@ from openmc import Filter, Nuclide -class _CrossScore(object): +class CrossScore(object): """A special-purpose tally score used to encapsulate all combinations of two tally's scores as a outer product for tally arithmetic. Parameters ---------- - left_score : str or _CrossScore + left_score : str or CrossScore The left score in the outer product - right_score : str or _CrossScore + right_score : str or CrossScore The right score in the outer product binary_op : str The tally arithmetic binary operator (e.g., '+', '-', etc.) used to - combine two tally's scores with this _CrossNuclide + combine two tally's scores with this CrossNuclide Attributes ---------- - left_score : str or _CrossScore + left_score : str or CrossScore The left score in the outer product - right_score : str or _CrossScore + right_score : str or CrossScore The right score in the outer product binary_op : str The tally arithmetic binary operator (e.g., '+', '-', etc.) used to - combine two tally's scores with this _CrossNuclide + combine two tally's scores with this CrossNuclide """ @@ -70,29 +70,29 @@ class _CrossScore(object): return string -class _CrossNuclide(object): +class CrossNuclide(object): """A special-purpose nuclide used to encapsulate all combinations of two tally's nuclides as a outer product for tally arithmetic. Parameters ---------- - left_nuclide : Nuclide or _CrossNuclide + left_nuclide : Nuclide or CrossNuclide The left nuclide in the outer product - right_nuclide : Nuclide or _CrossNuclide + right_nuclide : Nuclide or CrossNuclide The right nuclide in the outer product binary_op : str The tally arithmetic binary operator (e.g., '+', '-', etc.) used to - combine two tally's nuclides with this _CrossNuclide + combine two tally's nuclides with this CrossNuclide Attributes ---------- - left_nuclide : Nuclide or _CrossNuclide + left_nuclide : Nuclide or CrossNuclide The left nuclide in the outer product - right_nuclide : Nuclide or _CrossNuclide + right_nuclide : Nuclide or CrossNuclide The right nuclide in the outer product binary_op : str The tally arithmetic binary operator (e.g., '+', '-', etc.) used to - combine two tally's nuclides with this _CrossNuclide + combine two tally's nuclides with this CrossNuclide """ @@ -156,29 +156,29 @@ class _CrossNuclide(object): return string -class _CrossFilter(object): +class CrossFilter(object): """A special-purpose filter used to encapsulate all combinations of two tally's filter bins as a outer product for tally arithmetic. Parameters ---------- - left_filter : Filter or _CrossFilter + left_filter : Filter or CrossFilter The left filter in the outer product - right_filter : Filter or _CrossFilter + right_filter : Filter or CrossFilter The right filter in the outer product binary_op : str The tally arithmetic binary operator (e.g., '+', '-', etc.) used to - combine two tally's filter bins with this _CrossFilter + combine two tally's filter bins with this CrossFilter Attributes ---------- - left_filter : Filter or _CrossFilter + left_filter : Filter or CrossFilter The left filter in the outer product - right_filter : Filter or _CrossFilter + right_filter : Filter or CrossFilter The right filter in the outer product binary_op : str The tally arithmetic binary operator (e.g., '+', '-', etc.) used to - combine two tally's filter bins with this _CrossFilter + combine two tally's filter bins with this CrossFilter """ @@ -250,7 +250,7 @@ class _CrossFilter(object): def __repr__(self): - string = '_CrossFilter\n' + string = 'CrossFilter\n' filter_type = '({0} {1} {2})'.format(self.left_filter.type, self.binary_op, self.right_filter.type) diff --git a/openmc/tallies.py b/openmc/tallies.py index 75830d8f8..4f30a9487 100644 --- a/openmc/tallies.py +++ b/openmc/tallies.py @@ -10,7 +10,7 @@ import sys import numpy as np from openmc import Mesh, Filter, Trigger, Nuclide -from openmc.cross import _CrossScore, _CrossNuclide, _CrossFilter +from openmc.cross import CrossScore, CrossNuclide, CrossFilter from openmc.summary import Summary from openmc.checkvalue import check_type, check_value, check_greater_than from openmc.clean_xml import * @@ -329,7 +329,7 @@ class Tally(object): """ - if not isinstance(filter, (Filter, _CrossFilter)): + if not isinstance(filter, (Filter, CrossFilter)): msg = 'Unable to add Filter "{0}" to Tally ID={1} since it is ' \ 'not a Filter object'.format(filter, self.id) raise ValueError(msg) @@ -358,7 +358,7 @@ class Tally(object): """ - if not isinstance(score, (basestring, _CrossScore)): + if not isinstance(score, (basestring, CrossScore)): msg = 'Unable to add score "{0}" to Tally ID={1} since it is ' \ 'not a string'.format(score, self.id) raise ValueError(msg) @@ -1040,7 +1040,7 @@ class Tally(object): # Split CrossFilters into separate filters split_filters = [] for filter in self.filters: - if isinstance(filter, _CrossFilter): + if isinstance(filter, CrossFilter): split_filters.extend(filter.split_filters()) else: split_filters.append(filter) @@ -1437,8 +1437,8 @@ class Tally(object): This is a helper method for the tally arithmetic methods. The filters, scores and nuclides from both tallies are enumerated into all possible - combinations and expressed as _CrossFilter, _CrossScore and - _CrossNuclide objects in the new derived tally. + combinations and expressed as CrossFilter, CrossScore and + CrossNuclide objects in the new derived tally. Parameters ---------- @@ -1467,7 +1467,7 @@ class Tally(object): else: all_filters = [self.filters, other.filters] for self_filter, other_filter in itertools.product(*all_filters): - new_filter = _CrossFilter(self_filter, other_filter, binary_op) + new_filter = CrossFilter(self_filter, other_filter, binary_op) new_tally.add_filter(new_filter) # Generate score "outer products" @@ -1477,7 +1477,7 @@ class Tally(object): else: all_scores = [self.scores, other.scores] for self_score, other_score in itertools.product(*all_scores): - new_score = _CrossScore(self_score, other_score, binary_op) + new_score = CrossScore(self_score, other_score, binary_op) new_tally.add_score(new_score) # Generate nuclide "outer products" @@ -1487,7 +1487,7 @@ class Tally(object): else: all_nuclides = [self.nuclides, other.nuclides] for self_nuclide, other_nuclide in itertools.product(*all_nuclides): - new_nuclide = _CrossNuclide(self_nuclide, other_nuclide, binary_op) + new_nuclide = CrossNuclide(self_nuclide, other_nuclide, binary_op) new_tally.add_nuclide(new_nuclide) def _align_tally_data(self, other):