From 6cada92c50c8e2bdec93b9610ec54ab86c3d151a Mon Sep 17 00:00:00 2001
From: Paul Romano <paul.k.romano@gmail.com>
Date: Thu, 27 Jul 2017 13:18:49 -0500
Subject: [PATCH] Update tallies.xml in examples to separate <filter>

---
 examples/xml/basic/tallies.xml              | 21 +++++++++++++++------
 examples/xml/lattice/nested/tallies.xml     |  6 +++++-
 examples/xml/lattice/simple/tallies.xml     |  6 +++++-
 examples/xml/pincell/tallies.xml            | 11 +++++++++--
 examples/xml/pincell_multigroup/tallies.xml |  9 +++++++--
 5 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/examples/xml/basic/tallies.xml b/examples/xml/basic/tallies.xml
index 26e61995d..a125e9ca2 100644
--- a/examples/xml/basic/tallies.xml
+++ b/examples/xml/basic/tallies.xml
@@ -1,21 +1,30 @@
 <?xml version="1.0"?>
 <tallies>
 
+  <filter id="1" type="cell">
+    <bins>100</bins>
+  </filter>
+
+  <filter id="2" type="energy">
+    <bins>0 20.0e6</bins>
+  </filter>
+
+  <filter id="3" type="energyout">
+    <bins>0 20.0e6</bins>
+  </filter>
+
   <tally id="1">
-    <filter type="cell" bins="100" />
+    <filters>1</filters>
     <scores>total scatter nu-scatter absorption fission nu-fission</scores>
   </tally>
 
   <tally id="2">
-    <filter type="cell" bins="100" />
-    <filter type="energy" bins="0 20.0e6" />
+    <filters>1 2</filters>
     <scores>total scatter nu-scatter absorption fission nu-fission</scores>
   </tally>
 
   <tally id="3">
-    <filter type="cell" bins="100" />
-    <filter type="energy" bins="0 20.0e6" />
-    <filter type="energyout" bins="0 20.0e6" />
+    <filters>1 2 3</filters>
     <scores>scatter nu-scatter nu-fission</scores>
   </tally>
 
diff --git a/examples/xml/lattice/nested/tallies.xml b/examples/xml/lattice/nested/tallies.xml
index 89c0774f1..d342174a9 100644
--- a/examples/xml/lattice/nested/tallies.xml
+++ b/examples/xml/lattice/nested/tallies.xml
@@ -8,8 +8,12 @@
     <width>1.0 1.0</width>
   </mesh>
 
+  <filter id="1" type="mesh">
+    <bins>1</bins>
+  </filter>
+
   <tally id="1">
-    <filter type="mesh" bins="1" />
+    <filters>1</filters>
     <scores>total</scores>
   </tally>
 
diff --git a/examples/xml/lattice/simple/tallies.xml b/examples/xml/lattice/simple/tallies.xml
index 89c0774f1..d342174a9 100644
--- a/examples/xml/lattice/simple/tallies.xml
+++ b/examples/xml/lattice/simple/tallies.xml
@@ -8,8 +8,12 @@
     <width>1.0 1.0</width>
   </mesh>
 
+  <filter id="1" type="mesh">
+    <bins>1</bins>
+  </filter>
+
   <tally id="1">
-    <filter type="mesh" bins="1" />
+    <filters>1</filters>
     <scores>total</scores>
   </tally>
 
diff --git a/examples/xml/pincell/tallies.xml b/examples/xml/pincell/tallies.xml
index f740530cf..642bdd7cd 100644
--- a/examples/xml/pincell/tallies.xml
+++ b/examples/xml/pincell/tallies.xml
@@ -7,9 +7,16 @@
     <upper_right>0.62992  0.62992  1.e50</upper_right>
   </mesh>
 
+  <filter id="1" type="mesh">
+    <bins>1</bins>
+  </filter>
+
+  <filter id="2" type="energy">
+    <bins>0. 4. 20.0e6</bins>
+  </filter>
+
   <tally id="1">
-    <filter type="mesh" bins="1" />
-    <filter type="energy" bins="0. 4. 20.0e6" />
+    <filters>1 2</filters>
     <scores>flux fission nu-fission</scores>
   </tally>
 
diff --git a/examples/xml/pincell_multigroup/tallies.xml b/examples/xml/pincell_multigroup/tallies.xml
index 1591a556b..d84e129f2 100644
--- a/examples/xml/pincell_multigroup/tallies.xml
+++ b/examples/xml/pincell_multigroup/tallies.xml
@@ -5,9 +5,14 @@
         <lower_left>-0.63 -0.63 -1e+50</lower_left>
         <upper_right>0.63 0.63 1e+50</upper_right>
     </mesh>
+    <filter id="1" type="energy">
+      <bins>1e-05 0.0635 10.0 100.0 1000.0 500000.0 1000000.0 20000000.0</bins>
+    </filter>
+    <filter id="2" type="mesh">
+      <bins>1</bins>
+    </filter>
     <tally id="1" name="tally 1">
-        <filter bins="1e-05 0.0635 10.0 100.0 1000.0 500000.0 1000000.0 20000000.0" type="energy" />
-        <filter bins="1" type="mesh" />
+        <filters>1 2</filters>
         <scores>flux fission nu-fission</scores>
     </tally>
 </tallies>