From afc4304ff9825c1f514b43a035453ff7f68bd377 Mon Sep 17 00:00:00 2001
From: Paul Romano <romano7@gmail.com>
Date: Mon, 31 Oct 2011 16:26:14 -0400
Subject: [PATCH] Updated examples/basic.

---
 examples/basic/geometry.xml |  6 ++----
 examples/basic/tallies.xml  | 27 ++++++++++++++++-----------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/examples/basic/geometry.xml b/examples/basic/geometry.xml
index eef6f8906..f0d46eb4e 100644
--- a/examples/basic/geometry.xml
+++ b/examples/basic/geometry.xml
@@ -2,16 +2,14 @@
 <geometry>
 
 <!-- Definition of Cells -->
-  <cell uid="1" universe="0" fill="37" surfaces="-2 4 -5" />
+  <cell uid="1" universe="0" fill="37" surfaces="-2" />
   <cell uid="100" universe="37" material="40" surfaces="-1" />
   <cell uid="101" universe="37" material="41" surfaces="1" />
-  <cell uid="2" universe="0" material="41" surfaces = "2 -3 4 -5" />
+  <cell uid="2" universe="0" material="41" surfaces = "2 -3" />
 
 <!-- Defition of Surfaces -->
   <surface uid="1" type="z-cylinder" coeffs="0 0 7" />
   <surface uid="2" type="z-cylinder" coeffs="0 0 9" />
   <surface uid="3" type="z-cylinder" coeffs="0 0 11" boundary="vacuum" />
-  <surface uid="4" type="z-plane"    coeffs="-50"    boundary="vacuum" />
-  <surface uid="5" type="z-plane"    coeffs="50"     boundary="vacuum" />
     
 </geometry>
diff --git a/examples/basic/tallies.xml b/examples/basic/tallies.xml
index 06f594a01..acafe7674 100644
--- a/examples/basic/tallies.xml
+++ b/examples/basic/tallies.xml
@@ -1,23 +1,28 @@
 <?xml version="1.0"?>
 <tallies>
 
-  <mesh id="32">
-    <type>rectangular</type>
-    <dimension>1 1 5</dimension>
-    <origin>-50.0 -50.0 -50.0</origin>
-    <width>100.0 100.0 20.0</width>
-  </mesh>
-
   <tally id="1">
-    <!-- this is where you specify filters -->
     <filters>
       <cell>100</cell>
-      <mesh>32</mesh>
     </filters>
+    <macros>total scatter nu-scatter absorption fission nu-fission</macros>
+  </tally>
 
-    <!-- which reactions to score -->
-    <macros>total scatter absorption fission nu-fission</macros>
+  <tally id="2">
+    <filters>
+      <cell>100</cell>
+      <energy>0 20.0</energy>
+    </filters>
+    <macros>total scatter nu-scatter absorption fission nu-fission</macros>
+  </tally>
 
+  <tally id="3">
+    <filters>
+      <cell>100</cell>
+      <energy>0 20.0</energy>
+      <energyout>0 20.0</energyout>
+    </filters>
+    <macros>scatter nu-scatter nu-fission</macros>
   </tally>
 
 </tallies>