Changes to address comments by @samuelshaner

This commit is contained in:
Will Boyd 2016-05-29 23:14:09 -04:00
parent a3126e8320
commit 4fe252ba8a
2 changed files with 0 additions and 12 deletions

View file

@ -504,16 +504,6 @@ class StatePoint(object):
This routine searches the list of Tallies and returns the first Tally
found which satisfies all of the input parameters.
If the "exactness" parameter is 0 (default), the input parameters
do not need to match the complete Tally specification and may only
represent a subset of the Tally's properties. If the "exactness"
parameter is 1 then the length of the scores, filters, nuclides
parameters must precisely match those of any matching Tally, but the
filter bins may represent a subset of those in any matching Tally
(useful if tallies are merged in the input). If the "exactness"
parameter is 2 then the values of the scores, nuclides and filters
parameters must precisely match those of any matching Tally.
NOTE: If any of the "exact" parameters are False (default), the input
parameters do not need to match the complete Tally specification and
may only represent a subset of the Tally's properties. If an "exact"

View file

@ -762,8 +762,6 @@ class Tally(object):
# If filters are the second mergeable filters encountered
elif filter1.can_merge(filter2) and merge_filters:
merge_filters = True
mergeable_filter = True
return False
# If no mergeable filter was found, the tallies are not mergeable