diff --git a/docs/source/io_formats/tallies.rst b/docs/source/io_formats/tallies.rst index 9c0a2515e1..25f40c3704 100644 --- a/docs/source/io_formats/tallies.rst +++ b/docs/source/io_formats/tallies.rst @@ -123,8 +123,8 @@ to the scored values. The ``filter`` element has the following attributes/sub-elements: :type: - The type of the filter. Accepted options are "cell", "cellborn", - "material", "universe", "energy", "energyout", "mu", "polar", + The type of the filter. Accepted options are "cell", "cellfrom", + "cellborn", "material", "universe", "energy", "energyout", "mu", "polar", "azimuthal", "mesh", "distribcell", "delayedgroup", and "energyfunction". @@ -154,14 +154,24 @@ For each filter type, the following table describes what the ``bins`` attribute should be set to: :cell: - A list of unique IDs for cells in which the tally should be accumulated. + A list of cells or unique IDs for cells in which the tally should be + accumulated. + +:cellfrom: + This filter allows the tally to be scored when crossing a surface and the + particle came from a specified cell. A list of cell or cell IDs should be + given. + To tally a partial current from a cell to another, this filter should be + used in combination with a cell filter. + This filter should not be used in combination with a surface or meshfilter. :cellborn: This filter allows the tally to be scored to only when particles were - originally born in a specified cell. A list of cell IDs should be given. + originally born in a specified cell. A list of cell or cell IDs should be + given. :material: - A list of unique IDs for matreials in which the tally should be accumulated. + A list of unique IDs for materials in which the tally should be accumulated. :universe: A list of unique IDs for universes in which the tally should be accumulated. diff --git a/src/relaxng/tallies.rnc b/src/relaxng/tallies.rnc index 4674fd4c03..5ab8971e6c 100644 --- a/src/relaxng/tallies.rnc +++ b/src/relaxng/tallies.rnc @@ -35,12 +35,14 @@ element tallies { element filter { (element id { xsd:int } | attribute id { xsd:int }) & ( - ( (element type { ( "cell" | "cellborn" | "material" | "universe" | - "surface" | "distribcell" | "mesh" | "energy" | "energyout" | "mu" | - "polar" | "azimuthal" | "delayedgroup" | "energyfunction") } | - attribute type { ( "cell" | "cellborn" | "material" | "universe" | - "surface" | "distribcell" | "mesh" | "energy" | "energyout" | "mu" | - "polar" | "azimuthal" | "delayedgroup" | "energyfunction") }) & + ( (element type { ( "cell" | "cellfrom" | "cellborn" | "material" | + "universe" | "surface" | "distribcell" | "mesh" | "energy" | + "energyout" | "mu" | "polar" | "azimuthal" | "delayedgroup" | + "energyfunction") } | + attribute type { ( "cell" | "cellfrom" | "cellborn" | "material" | + "universe" | "surface" | "distribcell" | "mesh" | "energy" | + "energyout" | "mu" | "polar" | "azimuthal" | "delayedgroup" | + "energyfunction") }) & (element bins { list { xsd:double+ } } | attribute bins { list { xsd:double+ } }) ) | diff --git a/src/relaxng/tallies.rng b/src/relaxng/tallies.rng index 1c68e57e83..bad2fdce91 100644 --- a/src/relaxng/tallies.rng +++ b/src/relaxng/tallies.rng @@ -168,6 +168,7 @@ cell + cellfrom cellborn material universe @@ -186,6 +187,7 @@ cell + cellfrom cellborn material universe