From 78d14133dbd7cb24c42b99256d36a67c4cd0b15e Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Fri, 2 Oct 2015 01:25:41 -0400
Subject: [PATCH 1/7] Updated OpenCG compatiblity module to reflect move to
 PEP8 use of underscores in place of camelCase

---
 openmc/material.py          |   9 +-
 openmc/mesh.py              |   8 +-
 openmc/opencg_compatible.py | 182 ++++++++++++++++++------------------
 openmc/surface.py           |   7 +-
 openmc/tallies.py           |   7 +-
 openmc/universe.py          |  21 +++--
 6 files changed, 128 insertions(+), 106 deletions(-)

diff --git a/openmc/material.py b/openmc/material.py
index e495357b54..4f60abc676 100644
--- a/openmc/material.py
+++ b/openmc/material.py
@@ -132,9 +132,12 @@ class Material(object):
 
     @name.setter
     def name(self, name):
-        check_type('name for Material ID="{0}"'.format(self._id),
-                   name, basestring)
-        self._name = name
+        if name is not None:
+            check_type('name for Material ID="{0}"'.format(self._id),
+                       name, basestring)
+            self._name = name
+        else:
+            self._name = None
 
     def set_density(self, units, density=NO_DENSITY):
         """Set the density of the material
diff --git a/openmc/mesh.py b/openmc/mesh.py
index 2fe873d2bc..af13d984df 100644
--- a/openmc/mesh.py
+++ b/openmc/mesh.py
@@ -148,8 +148,12 @@ class Mesh(object):
 
     @name.setter
     def name(self, name):
-        check_type('name for mesh ID="{0}"'.format(self._id), name, basestring)
-        self._name = name
+        if name is not None:
+            check_type('name for mesh ID="{0}"'.format(self._id),
+                       name, basestring)
+            self._name = name
+        else:
+            self._name = None
 
     @type.setter
     def type(self, meshtype):
diff --git a/openmc/opencg_compatible.py b/openmc/opencg_compatible.py
index 65e980c003..682ef0ecac 100644
--- a/openmc/opencg_compatible.py
+++ b/openmc/opencg_compatible.py
@@ -83,14 +83,14 @@ def get_opencg_material(openmc_material):
         raise ValueError(msg)
 
     global OPENCG_MATERIALS
-    material_id = openmc_material._id
+    material_id = openmc_material.id
 
     # If this Material was already created, use it
     if material_id in OPENCG_MATERIALS:
         return OPENCG_MATERIALS[material_id]
 
     # Create an OpenCG Material to represent this OpenMC Material
-    name = openmc_material._name
+    name = openmc_material.name
     opencg_material = opencg.Material(material_id=material_id, name=name)
 
     # Add the OpenMC Material to the global collection of all OpenMC Materials
@@ -123,14 +123,14 @@ def get_openmc_material(opencg_material):
         raise ValueError(msg)
 
     global OPENMC_MATERIALS
-    material_id = opencg_material._id
+    material_id = opencg_material.id
 
     # If this Material was already created, use it
     if material_id in OPENMC_MATERIALS:
         return OPENMC_MATERIALS[material_id]
 
     # Create an OpenMC Material to represent this OpenCG Material
-    name = opencg_material._name
+    name = opencg_material.name
     openmc_material = openmc.Material(material_id=material_id, name=name)
 
     # Add the OpenMC Material to the global collection of all OpenMC Materials
@@ -168,8 +168,8 @@ def is_opencg_surface_compatible(opencg_surface):
               'since "{0}" is not a Surface'.format(opencg_surface)
         raise ValueError(msg)
 
-    if opencg_surface._type in ['x-squareprism',
-                                 'y-squareprism', 'z-squareprism']:
+    if opencg_surface.type in ['x-squareprism',
+                               'y-squareprism', 'z-squareprism']:
         return False
     else:
         return True
@@ -196,59 +196,59 @@ def get_opencg_surface(openmc_surface):
         raise ValueError(msg)
 
     global OPENCG_SURFACES
-    surface_id = openmc_surface._id
+    surface_id = openmc_surface.id
 
     # If this Material was already created, use it
     if surface_id in OPENCG_SURFACES:
         return OPENCG_SURFACES[surface_id]
 
     # Create an OpenCG Surface to represent this OpenMC Surface
-    name = openmc_surface._name
+    name = openmc_surface.name
 
     # Correct for OpenMC's syntax for Surfaces dividing Cells
-    boundary = openmc_surface._boundary_type
+    boundary = openmc_surface.boundary_type
     if boundary == 'transmission':
         boundary = 'interface'
 
     opencg_surface = None
 
-    if openmc_surface._type == 'plane':
-        A = openmc_surface._coeffs['A']
-        B = openmc_surface._coeffs['B']
-        C = openmc_surface._coeffs['C']
-        D = openmc_surface._coeffs['D']
+    if openmc_surface.type == 'plane':
+        A = openmc_surface.coeffs['A']
+        B = openmc_surface.coeffs['B']
+        C = openmc_surface.coeffs['C']
+        D = openmc_surface.coeffs['D']
         opencg_surface = opencg.Plane(surface_id, name, boundary, A, B, C, D)
 
-    elif openmc_surface._type == 'x-plane':
-        x0 = openmc_surface._coeffs['x0']
+    elif openmc_surface.type == 'x-plane':
+        x0 = openmc_surface.coeffs['x0']
         opencg_surface = opencg.XPlane(surface_id, name, boundary, x0)
 
-    elif openmc_surface._type == 'y-plane':
-        y0 = openmc_surface._coeffs['y0']
+    elif openmc_surface.type == 'y-plane':
+        y0 = openmc_surface.coeffs['y0']
         opencg_surface = opencg.YPlane(surface_id, name, boundary, y0)
 
-    elif openmc_surface._type == 'z-plane':
-        z0 = openmc_surface._coeffs['z0']
+    elif openmc_surface.type == 'z-plane':
+        z0 = openmc_surface.coeffs['z0']
         opencg_surface = opencg.ZPlane(surface_id, name, boundary, z0)
 
-    elif openmc_surface._type == 'x-cylinder':
-        y0 = openmc_surface._coeffs['y0']
-        z0 = openmc_surface._coeffs['z0']
-        R = openmc_surface._coeffs['R']
+    elif openmc_surface.type == 'x-cylinder':
+        y0 = openmc_surface.coeffs['y0']
+        z0 = openmc_surface.coeffs['z0']
+        R = openmc_surface.coeffs['R']
         opencg_surface = opencg.XCylinder(surface_id, name,
                                             boundary, y0, z0, R)
 
-    elif openmc_surface._type == 'y-cylinder':
-        x0 = openmc_surface._coeffs['x0']
-        z0 = openmc_surface._coeffs['z0']
-        R = openmc_surface._coeffs['R']
+    elif openmc_surface.type == 'y-cylinder':
+        x0 = openmc_surface.coeffs['x0']
+        z0 = openmc_surface.coeffs['z0']
+        R = openmc_surface.coeffs['R']
         opencg_surface = opencg.YCylinder(surface_id, name,
                                             boundary, x0, z0, R)
 
-    elif openmc_surface._type == 'z-cylinder':
-        x0 = openmc_surface._coeffs['x0']
-        y0 = openmc_surface._coeffs['y0']
-        R = openmc_surface._coeffs['R']
+    elif openmc_surface.type == 'z-cylinder':
+        x0 = openmc_surface.coeffs['x0']
+        y0 = openmc_surface.coeffs['y0']
+        R = openmc_surface.coeffs['R']
         opencg_surface = opencg.ZCylinder(surface_id, name,
                                             boundary, x0, y0, R)
 
@@ -282,52 +282,52 @@ def get_openmc_surface(opencg_surface):
         raise ValueError(msg)
 
     global openmc_surface
-    surface_id = opencg_surface._id
+    surface_id = opencg_surface.id
 
     # If this Surface was already created, use it
     if surface_id in OPENMC_SURFACES:
         return OPENMC_SURFACES[surface_id]
 
     # Create an OpenMC Surface to represent this OpenCG Surface
-    name = opencg_surface._name
+    name = opencg_surface.name
 
     # Correct for OpenMC's syntax for Surfaces dividing Cells
-    boundary = opencg_surface._boundary_type
+    boundary = opencg_surface.boundary_type
     if boundary == 'interface':
         boundary = 'transmission'
 
-    if opencg_surface._type == 'plane':
+    if opencg_surface.type == 'plane':
         A = opencg_surface._coeffs['A']
         B = opencg_surface._coeffs['B']
         C = opencg_surface._coeffs['C']
         D = opencg_surface._coeffs['D']
         openmc_surface = openmc.Plane(surface_id, boundary, A, B, C, D, name)
 
-    elif opencg_surface._type == 'x-plane':
+    elif opencg_surface.type == 'x-plane':
         x0 = opencg_surface._coeffs['x0']
         openmc_surface = openmc.XPlane(surface_id, boundary, x0, name)
 
-    elif opencg_surface._type == 'y-plane':
+    elif opencg_surface.type == 'y-plane':
         y0 = opencg_surface._coeffs['y0']
         openmc_surface = openmc.YPlane(surface_id, boundary, y0, name)
 
-    elif opencg_surface._type == 'z-plane':
+    elif opencg_surface.type == 'z-plane':
         z0 = opencg_surface._coeffs['z0']
         openmc_surface = openmc.ZPlane(surface_id, boundary, z0, name)
 
-    elif opencg_surface._type == 'x-cylinder':
+    elif opencg_surface.type == 'x-cylinder':
         y0 = opencg_surface._coeffs['y0']
         z0 = opencg_surface._coeffs['z0']
         R = opencg_surface._coeffs['R']
         openmc_surface = openmc.XCylinder(surface_id, boundary, y0, z0, R, name)
 
-    elif opencg_surface._type == 'y-cylinder':
+    elif opencg_surface.type == 'y-cylinder':
         x0 = opencg_surface._coeffs['x0']
         z0 = opencg_surface._coeffs['z0']
         R = opencg_surface._coeffs['R']
         openmc_surface = openmc.YCylinder(surface_id, boundary, x0, z0, R, name)
 
-    elif opencg_surface._type == 'z-cylinder':
+    elif opencg_surface.type == 'z-cylinder':
         x0 = opencg_surface._coeffs['x0']
         y0 = opencg_surface._coeffs['y0']
         R = opencg_surface._coeffs['R']
@@ -336,7 +336,7 @@ def get_openmc_surface(opencg_surface):
     else:
         msg = 'Unable to create an OpenMC Surface from an OpenCG ' \
               'Surface of type "{0}" since it is not a compatible ' \
-              'Surface type in OpenMC'.format(opencg_surface._type)
+              'Surface type in OpenMC'.format(opencg_surface.type)
         raise ValueError(msg)
 
     # Add the OpenMC Surface to the global collection of all OpenMC Surfaces
@@ -373,17 +373,17 @@ def get_compatible_opencg_surfaces(opencg_surface):
         raise ValueError(msg)
 
     global OPENMC_SURFACES
-    surface_id = opencg_surface._id
+    surface_id = opencg_surface.id
 
     # If this Surface was already created, use it
     if surface_id in OPENMC_SURFACES:
         return OPENMC_SURFACES[surface_id]
 
     # Create an OpenMC Surface to represent this OpenCG Surface
-    name = opencg_surface._name
-    boundary = opencg_surface._boundary_type
+    name = opencg_surface.name
+    boundary = opencg_surface.boundary_type
 
-    if opencg_surface._type == 'x-squareprism':
+    if opencg_surface.type == 'x-squareprism':
         y0 = opencg_surface._coeffs['y0']
         z0 = opencg_surface._coeffs['z0']
         R = opencg_surface._coeffs['R']
@@ -395,7 +395,7 @@ def get_compatible_opencg_surfaces(opencg_surface):
         top = opencg.ZPlane(name=name, boundary=boundary, z0=z0+R)
         surfaces = [left, right, bottom, top]
 
-    elif opencg_surface._type == 'y-squareprism':
+    elif opencg_surface.type == 'y-squareprism':
         x0 = opencg_surface._coeffs['x0']
         z0 = opencg_surface._coeffs['z0']
         R = opencg_surface._coeffs['R']
@@ -407,7 +407,7 @@ def get_compatible_opencg_surfaces(opencg_surface):
         top = opencg.ZPlane(name=name, boundary=boundary, z0=z0+R)
         surfaces = [left, right, bottom, top]
 
-    elif opencg_surface._type == 'z-squareprism':
+    elif opencg_surface.type == 'z-squareprism':
         x0 = opencg_surface._coeffs['x0']
         y0 = opencg_surface._coeffs['y0']
         R = opencg_surface._coeffs['R']
@@ -422,7 +422,7 @@ def get_compatible_opencg_surfaces(opencg_surface):
     else:
         msg = 'Unable to create a compatible OpenMC Surface an OpenCG ' \
               'Surface of type "{0}" since it already a compatible ' \
-              'Surface type in OpenMC'.format(opencg_surface._type)
+              'Surface type in OpenMC'.format(opencg_surface.type)
         raise ValueError(msg)
 
     # Add the OpenMC Surface(s) to the global collection of all OpenMC Surfaces
@@ -455,32 +455,32 @@ def get_opencg_cell(openmc_cell):
         raise ValueError(msg)
 
     global OPENCG_CELLS
-    cell_id = openmc_cell._id
+    cell_id = openmc_cell.id
 
     # If this Cell was already created, use it
     if cell_id in OPENCG_CELLS:
         return OPENCG_CELLS[cell_id]
 
     # Create an OpenCG Cell to represent this OpenMC Cell
-    name = openmc_cell._name
+    name = openmc_cell.name
     opencg_cell = opencg.Cell(cell_id, name)
 
-    fill = openmc_cell._fill
+    fill = openmc_cell.fill
 
-    if (openmc_cell._type == 'normal'):
+    if (openmc_cell.type == 'normal'):
         opencg_cell.setFill(get_opencg_material(fill))
-    elif (openmc_cell._type == 'fill'):
+    elif (openmc_cell.type == 'fill'):
         opencg_cell.setFill(get_opencg_universe(fill))
     else:
         opencg_cell.setFill(get_opencg_lattice(fill))
 
-    if openmc_cell._rotation is not None:
-        opencg_cell.setRotation(openmc_cell._rotation)
+    if openmc_cell.rotation is not None:
+        opencg_cell.setRotation(openmc_cell.rotation)
 
-    if openmc_cell._translation is not None:
-        opencg_cell.setTranslation(openmc_cell._translation)
+    if openmc_cell.translation is not None:
+        opencg_cell.setTranslation(openmc_cell.translation)
 
-    surfaces = openmc_cell._surfaces
+    surfaces = openmc_cell.surfaces
 
     for surface_id in surfaces:
         surface = surfaces[surface_id][0]
@@ -536,8 +536,8 @@ def get_compatible_opencg_cells(opencg_cell, opencg_surface, halfspace):
     compatible_cells = []
 
     # SquarePrism Surfaces
-    if opencg_surface._type in ['x-squareprism', 'y-squareprism',
-                                'z-squareprism']:
+    if opencg_surface.type in ['x-squareprism', 'y-squareprism',
+                               'z-squareprism']:
 
         # Get the compatible Surfaces (XPlanes and YPlanes)
         compatible_surfaces = get_compatible_opencg_surfaces(opencg_surface)
@@ -690,31 +690,31 @@ def get_openmc_cell(opencg_cell):
         raise ValueError(msg)
 
     global OPENMC_CELLS
-    cell_id = opencg_cell._id
+    cell_id = opencg_cell.id
 
     # If this Cell was already created, use it
     if cell_id in OPENMC_CELLS:
         return OPENMC_CELLS[cell_id]
 
     # Create an OpenCG Cell to represent this OpenMC Cell
-    name = opencg_cell._name
+    name = opencg_cell.name
     openmc_cell = openmc.Cell(cell_id, name)
 
-    fill = opencg_cell._fill
+    fill = opencg_cell.fill
 
-    if (opencg_cell._type == 'universe'):
+    if (opencg_cell.type == 'universe'):
         openmc_cell.fill = get_openmc_universe(fill)
-    elif (opencg_cell._type == 'lattice'):
+    elif (opencg_cell.type == 'lattice'):
         openmc_cell.fill = get_openmc_lattice(fill)
     else:
         openmc_cell.fill = get_openmc_material(fill)
 
-    if opencg_cell._rotation:
-        rotation = np.asarray(opencg_cell._rotation, dtype=np.int)
+    if opencg_cell.rotation:
+        rotation = np.asarray(opencg_cell.rotation, dtype=np.int)
         openmc_cell.rotation = rotation
 
-    if opencg_cell._translation:
-        translation = np.asarray(opencg_cell._translation, dtype=np.float64)
+    if opencg_cell.translation:
+        translation = np.asarray(opencg_cell.translation, dtype=np.float64)
         openmc_cell.setTranslation(translation)
 
     surfaces = opencg_cell._surfaces
@@ -754,18 +754,18 @@ def get_opencg_universe(openmc_universe):
         raise ValueError(msg)
 
     global OPENCG_UNIVERSES
-    universe_id = openmc_universe._id
+    universe_id = openmc_universe.id
 
     # If this Universe was already created, use it
     if universe_id in OPENCG_UNIVERSES:
         return OPENCG_UNIVERSES[universe_id]
 
     # Create an OpenCG Universe to represent this OpenMC Universe
-    name = openmc_universe._name
+    name = openmc_universe.name
     opencg_universe = opencg.Universe(universe_id, name)
 
     # Convert all OpenMC Cells in this Universe to OpenCG Cells
-    openmc_cells = openmc_universe._cells
+    openmc_cells = openmc_universe.cells
 
     for cell_id, openmc_cell in openmc_cells.items():
         opencg_cell = get_opencg_cell(openmc_cell)
@@ -801,7 +801,7 @@ def get_openmc_universe(opencg_universe):
         raise ValueError(msg)
 
     global OPENMC_UNIVERSES
-    universe_id = opencg_universe._id
+    universe_id = opencg_universe.id
 
     # If this Universe was already created, use it
     if universe_id in OPENMC_UNIVERSES:
@@ -811,7 +811,7 @@ def get_openmc_universe(opencg_universe):
     make_opencg_cells_compatible(opencg_universe)
 
     # Create an OpenMC Universe to represent this OpenCSg Universe
-    name = opencg_universe._name
+    name = opencg_universe.name
     openmc_universe = openmc.Universe(universe_id, name)
 
     # Convert all OpenCG Cells in this Universe to OpenMC Cells
@@ -851,7 +851,7 @@ def get_opencg_lattice(openmc_lattice):
         raise ValueError(msg)
 
     global OPENCG_LATTICES
-    lattice_id = openmc_lattice._id
+    lattice_id = openmc_lattice.id
 
     # If this Lattice was already created, use it
     if lattice_id in OPENCG_LATTICES:
@@ -888,7 +888,7 @@ def get_opencg_lattice(openmc_lattice):
     for z in range(dimension[2]):
         for y in range(dimension[1]):
             for x in range(dimension[0]):
-                universe_id = universes[x][dimension[1]-y-1][z]._id
+                universe_id = universes[x][dimension[1]-y-1][z].id
                 universe_array[z][y][x] = unique_universes[universe_id]
 
     opencg_lattice = opencg.Lattice(lattice_id, name)
@@ -931,23 +931,23 @@ def get_openmc_lattice(opencg_lattice):
         raise ValueError(msg)
 
     global OPENMC_LATTICES
-    lattice_id = opencg_lattice._id
+    lattice_id = opencg_lattice.id
 
     # If this Lattice was already created, use it
     if lattice_id in OPENMC_LATTICES:
         return OPENMC_LATTICES[lattice_id]
 
-    dimension = opencg_lattice._dimension
-    width = opencg_lattice._width
-    offset = opencg_lattice._offset
-    universes = opencg_lattice._universes
+    dimension = opencg_lattice.dimension
+    width = opencg_lattice.width
+    offset = opencg_lattice.offset
+    universes = opencg_lattice.universes
 
     # Initialize an empty array for the OpenMC nested Universes in this Lattice
     universe_array = np.ndarray(tuple(np.array(dimension)),
                                 dtype=openmc.Universe)
 
     # Create OpenMC Universes for each unique nested Universe in this Lattice
-    unique_universes = opencg_lattice.getUniqueUniverses()
+    unique_universes = opencg_lattice.get_unique_universes()
 
     for universe_id, universe in unique_universes.items():
         unique_universes[universe_id] = get_openmc_universe(universe)
@@ -956,7 +956,7 @@ def get_openmc_lattice(opencg_lattice):
     for z in range(dimension[2]):
         for y in range(dimension[1]):
             for x in range(dimension[0]):
-                universe_id = universes[z][y][x]._id
+                universe_id = universes[z][y][x].id
                 universe_array[x][y][z] = unique_universes[universe_id]
 
     # Reverse y-dimension in array to match ordering in OpenCG
@@ -1011,7 +1011,7 @@ def get_opencg_geometry(openmc_geometry):
     OPENMC_LATTICES.clear()
     OPENCG_LATTICES.clear()
 
-    openmc_root_universe = openmc_geometry._root_universe
+    openmc_root_universe = openmc_geometry.root_universe
     opencg_root_universe = get_opencg_universe(openmc_root_universe)
 
     opencg_geometry = opencg.Geometry()
@@ -1043,11 +1043,11 @@ def get_openmc_geometry(opencg_geometry):
 
     # Deep copy the goemetry since it may be modified to make all Surfaces
     # compatible with OpenMC's specifications
-    opencg_geometry.assignAutoIds()
+    opencg_geometry.assign_auto_ids()
     opencg_geometry = copy.deepcopy(opencg_geometry)
 
     # Update Cell bounding boxes in Geometry
-    opencg_geometry.updateBoundingBoxes()
+    opencg_geometry.update_bounding_boxes()
 
     # Clear dictionaries and auto-generated ID
     OPENMC_SURFACES.clear()
@@ -1060,14 +1060,14 @@ def get_openmc_geometry(opencg_geometry):
     OPENCG_LATTICES.clear()
 
     # Make the entire geometry "compatible" before assigning auto IDs
-    universes = opencg_geometry.getAllUniverses()
+    universes = opencg_geometry.get_all_universes()
     for universe_id, universe in universes.items():
         if not isinstance(universe, opencg.Lattice):
             make_opencg_cells_compatible(universe)
 
-    opencg_geometry.assignAutoIds()
+    opencg_geometry.assign_auto_ids()
 
-    opencg_root_universe = opencg_geometry._root_universe
+    opencg_root_universe = opencg_geometry.root_universe
     openmc_root_universe = get_openmc_universe(opencg_root_universe)
 
     openmc_geometry = openmc.Geometry()
diff --git a/openmc/surface.py b/openmc/surface.py
index 653754d303..164bbd09bf 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -101,8 +101,11 @@ class Surface(object):
 
     @name.setter
     def name(self, name):
-        check_type('surface name', name, basestring)
-        self._name = name
+        if name is not None:
+            check_type('surface name', name, basestring)
+            self._name = name
+        else:
+            self._name = None
 
     @boundary_type.setter
     def boundary_type(self, boundary_type):
diff --git a/openmc/tallies.py b/openmc/tallies.py
index 20a6af3f29..a1206f012a 100644
--- a/openmc/tallies.py
+++ b/openmc/tallies.py
@@ -373,8 +373,11 @@ class Tally(object):
 
     @name.setter
     def name(self, name):
-        check_type('tally name', name, basestring)
-        self._name = name
+        if name is not None:
+            check_type('tally name', name, basestring)
+            self._name = name
+        else:
+            self._name = None
 
     def add_filter(self, filter):
         """Add a filter to the tally
diff --git a/openmc/universe.py b/openmc/universe.py
index bab10f5df7..9516192802 100644
--- a/openmc/universe.py
+++ b/openmc/universe.py
@@ -117,8 +117,11 @@ class Cell(object):
 
     @name.setter
     def name(self, name):
-        cv.check_type('cell name', name, basestring)
-        self._name = name
+        if name is not None:
+            cv.check_type('cell name', name, basestring)
+            self._name = name
+        else:
+            self._name = None
 
     @fill.setter
     def fill(self, fill):
@@ -438,8 +441,11 @@ class Universe(object):
 
     @name.setter
     def name(self, name):
-        cv.check_type('universe name', name, basestring)
-        self._name = name
+        if name is not None:
+            cv.check_type('universe name', name, basestring)
+            self._name = name
+        else:
+            self._name = None
 
     def add_cell(self, cell):
         """Add a cell to the universe.
@@ -677,8 +683,11 @@ class Lattice(object):
 
     @name.setter
     def name(self, name):
-        cv.check_type('lattice name', name, basestring)
-        self._name = name
+        if name is not None:
+            cv.check_type('lattice name', name, basestring)
+            self._name = name
+        else:
+            self._name = None
 
     @outer.setter
     def outer(self, outer):

From a491dde24853022514631ced51c1db053679319b Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Fri, 2 Oct 2015 17:01:52 -0400
Subject: [PATCH 2/7] Updated OpenCG compatibility module to use OpenCG
 property getters for surfaces, cells and coeffs

---
 openmc/opencg_compatible.py | 58 ++++++++++++++++++-------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/openmc/opencg_compatible.py b/openmc/opencg_compatible.py
index 682ef0ecac..b41a621b40 100644
--- a/openmc/opencg_compatible.py
+++ b/openmc/opencg_compatible.py
@@ -297,40 +297,40 @@ def get_openmc_surface(opencg_surface):
         boundary = 'transmission'
 
     if opencg_surface.type == 'plane':
-        A = opencg_surface._coeffs['A']
-        B = opencg_surface._coeffs['B']
-        C = opencg_surface._coeffs['C']
-        D = opencg_surface._coeffs['D']
+        A = opencg_surface.coeffs['A']
+        B = opencg_surface.coeffs['B']
+        C = opencg_surface.coeffs['C']
+        D = opencg_surface.coeffs['D']
         openmc_surface = openmc.Plane(surface_id, boundary, A, B, C, D, name)
 
     elif opencg_surface.type == 'x-plane':
-        x0 = opencg_surface._coeffs['x0']
+        x0 = opencg_surface.coeffs['x0']
         openmc_surface = openmc.XPlane(surface_id, boundary, x0, name)
 
     elif opencg_surface.type == 'y-plane':
-        y0 = opencg_surface._coeffs['y0']
+        y0 = opencg_surface.coeffs['y0']
         openmc_surface = openmc.YPlane(surface_id, boundary, y0, name)
 
     elif opencg_surface.type == 'z-plane':
-        z0 = opencg_surface._coeffs['z0']
+        z0 = opencg_surface.coeffs['z0']
         openmc_surface = openmc.ZPlane(surface_id, boundary, z0, name)
 
     elif opencg_surface.type == 'x-cylinder':
-        y0 = opencg_surface._coeffs['y0']
-        z0 = opencg_surface._coeffs['z0']
-        R = opencg_surface._coeffs['R']
+        y0 = opencg_surface.coeffs['y0']
+        z0 = opencg_surface.coeffs['z0']
+        R = opencg_surface.coeffs['R']
         openmc_surface = openmc.XCylinder(surface_id, boundary, y0, z0, R, name)
 
     elif opencg_surface.type == 'y-cylinder':
-        x0 = opencg_surface._coeffs['x0']
-        z0 = opencg_surface._coeffs['z0']
-        R = opencg_surface._coeffs['R']
+        x0 = opencg_surface.coeffs['x0']
+        z0 = opencg_surface.coeffs['z0']
+        R = opencg_surface.coeffs['R']
         openmc_surface = openmc.YCylinder(surface_id, boundary, x0, z0, R, name)
 
     elif opencg_surface.type == 'z-cylinder':
-        x0 = opencg_surface._coeffs['x0']
-        y0 = opencg_surface._coeffs['y0']
-        R = opencg_surface._coeffs['R']
+        x0 = opencg_surface.coeffs['x0']
+        y0 = opencg_surface.coeffs['y0']
+        R = opencg_surface.coeffs['R']
         openmc_surface = openmc.ZCylinder(surface_id, boundary, x0, y0, R, name)
 
     else:
@@ -384,9 +384,9 @@ def get_compatible_opencg_surfaces(opencg_surface):
     boundary = opencg_surface.boundary_type
 
     if opencg_surface.type == 'x-squareprism':
-        y0 = opencg_surface._coeffs['y0']
-        z0 = opencg_surface._coeffs['z0']
-        R = opencg_surface._coeffs['R']
+        y0 = opencg_surface.coeffs['y0']
+        z0 = opencg_surface.coeffs['z0']
+        R = opencg_surface.coeffs['R']
 
         # Create a list of the four planes we need
         left = opencg.YPlane(name=name, boundary=boundary, y0=y0-R)
@@ -396,9 +396,9 @@ def get_compatible_opencg_surfaces(opencg_surface):
         surfaces = [left, right, bottom, top]
 
     elif opencg_surface.type == 'y-squareprism':
-        x0 = opencg_surface._coeffs['x0']
-        z0 = opencg_surface._coeffs['z0']
-        R = opencg_surface._coeffs['R']
+        x0 = opencg_surface.coeffs['x0']
+        z0 = opencg_surface.coeffs['z0']
+        R = opencg_surface.coeffs['R']
 
         # Create a list of the four planes we need
         left = opencg.XPlane(name=name, boundary=boundary, x0=x0-R)
@@ -408,9 +408,9 @@ def get_compatible_opencg_surfaces(opencg_surface):
         surfaces = [left, right, bottom, top]
 
     elif opencg_surface.type == 'z-squareprism':
-        x0 = opencg_surface._coeffs['x0']
-        y0 = opencg_surface._coeffs['y0']
-        R = opencg_surface._coeffs['R']
+        x0 = opencg_surface.coeffs['x0']
+        y0 = opencg_surface.coeffs['y0']
+        R = opencg_surface.coeffs['R']
 
         # Create a list of the four planes we need
         left = opencg.XPlane(name=name, boundary=boundary, x0=x0-R)
@@ -631,12 +631,12 @@ def make_opencg_cells_compatible(opencg_universe):
         raise ValueError(msg)
 
     # Check all OpenCG Cells in this Universe for compatibility with OpenMC
-    opencg_cells = opencg_universe._cells
+    opencg_cells = opencg_universe.cells
 
     for cell_id, opencg_cell in opencg_cells.items():
 
         # Check each of the OpenCG Surfaces for OpenMC compatibility
-        surfaces = opencg_cell._surfaces
+        surfaces = opencg_cell.surfaces
 
         for surface_id in surfaces:
             surface = surfaces[surface_id][0]
@@ -717,7 +717,7 @@ def get_openmc_cell(opencg_cell):
         translation = np.asarray(opencg_cell.translation, dtype=np.float64)
         openmc_cell.setTranslation(translation)
 
-    surfaces = opencg_cell._surfaces
+    surfaces = opencg_cell.surfaces
 
     for surface_id in surfaces:
         surface = surfaces[surface_id][0]
@@ -815,7 +815,7 @@ def get_openmc_universe(opencg_universe):
     openmc_universe = openmc.Universe(universe_id, name)
 
     # Convert all OpenCG Cells in this Universe to OpenMC Cells
-    opencg_cells = opencg_universe._cells
+    opencg_cells = opencg_universe.cells
 
     for cell_id, opencg_cell in opencg_cells.items():
         openmc_cell = get_openmc_cell(opencg_cell)

From 147f2a162e7369f5559740f397a48a225e2cdf2a Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Fri, 2 Oct 2015 17:43:33 -0400
Subject: [PATCH 3/7] Updates to OpenCG compatibility module to reflect move to
 PEP8 compliance

---
 openmc/opencg_compatible.py | 42 ++++++++++++++++++-------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/openmc/opencg_compatible.py b/openmc/opencg_compatible.py
index b41a621b40..000801ca2a 100644
--- a/openmc/opencg_compatible.py
+++ b/openmc/opencg_compatible.py
@@ -467,25 +467,25 @@ def get_opencg_cell(openmc_cell):
 
     fill = openmc_cell.fill
 
-    if (openmc_cell.type == 'normal'):
-        opencg_cell.setFill(get_opencg_material(fill))
-    elif (openmc_cell.type == 'fill'):
-        opencg_cell.setFill(get_opencg_universe(fill))
+    if (openmc_cell.fill_type == 'material'):
+        opencg_cell.fill = get_opencg_material(fill)
+    elif (openmc_cell.fill_type == 'universe'):
+        opencg_cell.fill = get_opencg_universe(fill)
     else:
-        opencg_cell.setFill(get_opencg_lattice(fill))
+        opencg_cell.fill = get_opencg_lattice(fill)
 
     if openmc_cell.rotation is not None:
-        opencg_cell.setRotation(openmc_cell.rotation)
+        opencg_cell.rotation = openmc_cell.rotation
 
     if openmc_cell.translation is not None:
-        opencg_cell.setTranslation(openmc_cell.translation)
+        opencg_cell.translation = openmc_cell.translation
 
     surfaces = openmc_cell.surfaces
 
     for surface_id in surfaces:
         surface = surfaces[surface_id][0]
         halfspace = surfaces[surface_id][1]
-        opencg_cell.addSurface(get_opencg_surface(surface), halfspace)
+        opencg_cell.add_surface(get_opencg_surface(surface), halfspace)
 
     # Add the OpenMC Cell to the global collection of all OpenMC Cells
     OPENMC_CELLS[cell_id] = openmc_cell
@@ -546,10 +546,10 @@ def get_compatible_opencg_cells(opencg_cell, opencg_surface, halfspace):
 
         # If Cell is inside SquarePrism, add "inside" of Surface halfspaces
         if halfspace == -1:
-            opencg_cell.addSurface(compatible_surfaces[0], +1)
-            opencg_cell.addSurface(compatible_surfaces[1], -1)
-            opencg_cell.addSurface(compatible_surfaces[2], +1)
-            opencg_cell.addSurface(compatible_surfaces[3], -1)
+            opencg_cell.add_surface(compatible_surfaces[0], +1)
+            opencg_cell.add_surface(compatible_surfaces[1], -1)
+            opencg_cell.add_surface(compatible_surfaces[2], +1)
+            opencg_cell.add_surface(compatible_surfaces[3], -1)
             compatible_cells.append(opencg_cell)
 
         # If Cell is outside SquarePrism, add "outside" of Surface halfspaces
@@ -659,7 +659,7 @@ def make_opencg_cells_compatible(opencg_universe):
                 opencg_universe.removeCell(opencg_cell)
 
                 # Add the compatible OpenCG Cells to the Universe
-                opencg_universe.addCells(cells)
+                opencg_universe.add_cells(cells)
 
                 # Make recursive call to look at the updated state of the
                 # OpenCG Universe and return
@@ -715,7 +715,7 @@ def get_openmc_cell(opencg_cell):
 
     if opencg_cell.translation:
         translation = np.asarray(opencg_cell.translation, dtype=np.float64)
-        openmc_cell.setTranslation(translation)
+        openmc_cell.translation = translation
 
     surfaces = opencg_cell.surfaces
 
@@ -769,7 +769,7 @@ def get_opencg_universe(openmc_universe):
 
     for cell_id, openmc_cell in openmc_cells.items():
         opencg_cell = get_opencg_cell(openmc_cell)
-        opencg_universe.addCell(opencg_cell)
+        opencg_universe.add_cell(opencg_cell)
 
     # Add the OpenMC Universe to the global collection of all OpenMC Universes
     OPENMC_UNIVERSES[universe_id] = openmc_universe
@@ -892,14 +892,14 @@ def get_opencg_lattice(openmc_lattice):
                 universe_array[z][y][x] = unique_universes[universe_id]
 
     opencg_lattice = opencg.Lattice(lattice_id, name)
-    opencg_lattice.setDimension(dimension)
-    opencg_lattice.setWidth(pitch)
-    opencg_lattice.setUniverses(universe_array)
+    opencg_lattice.dimension = dimension
+    opencg_lattice.width = pitch
+    opencg_lattice.universes = universe_array
 
     offset = np.array(lower_left, dtype=np.float64) - \
              ((np.array(pitch, dtype=np.float64) *
                np.array(dimension, dtype=np.float64))) / -2.0
-    opencg_lattice.setOffset(offset)
+    opencg_lattice.offset = offset
 
     # Add the OpenMC Lattice to the global collection of all OpenMC Lattices
     OPENMC_LATTICES[lattice_id] = openmc_lattice
@@ -1015,8 +1015,8 @@ def get_opencg_geometry(openmc_geometry):
     opencg_root_universe = get_opencg_universe(openmc_root_universe)
 
     opencg_geometry = opencg.Geometry()
-    opencg_geometry.setRootUniverse(opencg_root_universe)
-    opencg_geometry.initializeCellOffsets()
+    opencg_geometry.root_universe = opencg_root_universe
+    opencg_geometry.initialize_cell_offsets()
 
     return opencg_geometry
 

From 221f026470c1c5d67ed0694d57b6ea9261200051 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 3 Oct 2015 14:30:16 -0400
Subject: [PATCH 4/7] Now using property decorators for surface coeffs in
 OpenCG compatibility module

---
 docs/source/pythonapi/examples/geometry.xml   |  38 ++++++++
 .../pythonapi/examples/materials-xy.png       | Bin 0 -> 1271 bytes
 docs/source/pythonapi/examples/materials.xml  |  20 +++++
 docs/source/pythonapi/examples/plots.xml      |   8 ++
 docs/source/pythonapi/examples/settings.xml   |  21 +++++
 docs/source/pythonapi/examples/tallies.xml    |  23 +++++
 .../tracks/128_angles_0.1_cm_spacing.data     | Bin 0 -> 108911 bytes
 openmc/opencg_compatible.py                   |  82 +++++++++---------
 8 files changed, 151 insertions(+), 41 deletions(-)
 create mode 100644 docs/source/pythonapi/examples/geometry.xml
 create mode 100644 docs/source/pythonapi/examples/materials-xy.png
 create mode 100644 docs/source/pythonapi/examples/materials.xml
 create mode 100644 docs/source/pythonapi/examples/plots.xml
 create mode 100644 docs/source/pythonapi/examples/settings.xml
 create mode 100644 docs/source/pythonapi/examples/tallies.xml
 create mode 100644 docs/source/pythonapi/examples/tracks/128_angles_0.1_cm_spacing.data

diff --git a/docs/source/pythonapi/examples/geometry.xml b/docs/source/pythonapi/examples/geometry.xml
new file mode 100644
index 0000000000..8e9f1ef3d1
--- /dev/null
+++ b/docs/source/pythonapi/examples/geometry.xml
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='utf-8'?>
+<geometry>
+    <cell id="10000" material="10000" name="1.6% Fuel" surfaces="-10000" universe="10000" />
+    <cell id="10001" material="10002" name="1.6% Clad" surfaces="10000 -10001" universe="10000" />
+    <cell id="10002" material="10001" name="1.6% Moderator" surfaces="10001" universe="10000" />
+    <cell fill="10001" id="10003" name="root cell" surfaces="10002 -10003 10004 -10005 10006 -10007" universe="0" />
+    <lattice id="10001" name="1.6% Fuel - 0BA">
+        <pitch>1.26 1.26</pitch>
+        <dimension>17 17</dimension>
+        <lower_left>-10.71 -10.71</lower_left>
+        <universes>
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
+10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 </universes>
+    </lattice>
+    <surface boundary="transmission" coeffs="0.0 0.0 0.39218" id="10000" type="z-cylinder" />
+    <surface boundary="transmission" coeffs="0.0 0.0 0.4572" id="10001" type="z-cylinder" />
+    <surface boundary="reflective" coeffs="-10.71" id="10002" type="x-plane" />
+    <surface boundary="vacuum" coeffs="10.71" id="10003" type="x-plane" />
+    <surface boundary="vacuum" coeffs="-10.71" id="10004" type="y-plane" />
+    <surface boundary="reflective" coeffs="10.71" id="10005" type="y-plane" />
+    <surface boundary="reflective" coeffs="-10.71" id="10006" type="z-plane" />
+    <surface boundary="reflective" coeffs="10.71" id="10007" type="z-plane" />
+</geometry>
diff --git a/docs/source/pythonapi/examples/materials-xy.png b/docs/source/pythonapi/examples/materials-xy.png
new file mode 100644
index 0000000000000000000000000000000000000000..534f7e5ff7251fbc6984a811cb22d37ea2df8c4e
GIT binary patch
literal 1271
zcmZ{kZB&wH7{_ljJ7-pN={b=rqgImUR4U5_0<%G2Qy`;BX__zP>(rBUL`@$h)2v)(
zSr(d2%W9rv%#}qY&6l*Y$jq?WFlFTn3L2<@JkLE^pY~xNuIqRI&$<5p>(hM|aoNm;
z_Fviq02T(Y=)qQ+Kh_*uYo8MRR&T}JSpOh@0Hi19TO#eO+9oZSxdqfeTQ*`9E23G!
zK>%bD0Lab%WX>H1;2;rz(Y*kW$^pQoR>-#dS!Wk;19=Px;Q>d-k=#>3^43xR{MnCz
zQQtG^;HaGo%PKxgW$j9{^5dHYwmwRv0$}?(fbP$WQ;mzs$!g*k1=&SocU~+gF18PG
z-{d98uMjc0k-pkSeq}S0d&)K`()QLC%GXraZRU9H=SeFb6s|b@pkiR+G^_rHw?jut
z6dudrtySi?t<!W$`J(YGZtK;MsCPJ5*EMzyDBsO(P+z*{-I3tQEGG`(ETO4BrziD_
z;zMgv=T1vXv`a*iOwOAae#mRdGgkX{oS+e!kWqS5yjr6>^H_2<awW4Z@2Rn&j}@}n
z`Q(&Qo}{2>_@{)Ng59fQG6;jtxVF{XCLOvKrc*nUmt4Z|l$=?HpyMd2e!23XuuQ0(
zxY4o}2C<#at8N@SA1D*uV=VIaC?2a$8({d?VU-=e*}`@cnTolIpLHdW2+1+<^_%xq
zlpG(QI7dzbCNr$wlbM-X_g*q;$lAUf5!dz)GHD0wa9k)=?;^}Qd|}$hxo)aqysF21
zedQBz*@uG0+UwO_@{M8XtfE)H-^9lGG%Cu!rdcD)DGCT-@1ZHRCh|L&K52_hjFirM
ziVuHNyWTMrd3=TD-g}``RM?Q$V|kjeqvq8kL5#h2+3j4D6IoTFLiwFMNHJYjHv3h;
z<*{a6wo;LSX%b!i?m_nHa2F3)%1(^hAC*u&DAxt2w5#X5=ZqN>go)i{SY7p*@TF-I
zm=G{y@)n=qz#fZ|H*h>Ja9Tcr-93lZsSA_Li@h#k(e28wo?PkP%@@zRBb|)s7PPBN
zpzN~73k&Tu^b4ez#)Q?v`dE{<JLVCj6dQsWjZo`nG(@=Olo~F$4LTIS-Q`PP)K%BO
z(6wPQ%Q*^~{s5t1i&RL1&4^3$FF6@Ij_C%O?fsid^X8Y+r0SiJax=4!JRITqCq^bi
z7P?3Dl174a%-%C*$!laUbcvHC`<Nx}_gBrrZlupBeKFAb7SrsIhQmq?Vq?({pg3pb
z8yJVSU9{$PVTIEXzrq@gqGr~66z^}rO-g#F@RW<bMz-F9&&GiMBo#rwg_Q<NF%`Dx
z@Xu%PT|=C|g$8t~8FM%UjZPNaA-Lc^+}ba1!H#Qbt^ekt-U8@(4YK=@u*cZQ8#F=y
zomFt_On<Zz852H~>hZ&-(^*DczTTGu+nynR3@M)LQ=~(jF`>b-&;BButEeKO>CGmk
zol(*lA9#=E)Pb~D$_o@o&5$BmQPn#+j27l%p|X<mSXPEv(uc(UMHA_0KhH>_KCPHV
zhS8Q~cj1y=Bvw^bG%7z-3kd@j+->B93i*kQG}$0wW%%3F#a-6l?kZsL1u>C=eWd6E
z`>X)#iR(6ct|NL9H}KYNAQ3l^Hg5JL`jCjk^;$3VKZYMuV&eB_{J-J5hO^cS20#FV
KO|RdwSM(2?bdD_m

literal 0
HcmV?d00001

diff --git a/docs/source/pythonapi/examples/materials.xml b/docs/source/pythonapi/examples/materials.xml
new file mode 100644
index 0000000000..42c2e50292
--- /dev/null
+++ b/docs/source/pythonapi/examples/materials.xml
@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='utf-8'?>
+<materials>
+    <default_xs>71c</default_xs>
+    <material id="10000" name="1.6% Fuel">
+        <density units="g/cm3" value="10.31341" />
+        <nuclide ao="0.022625" name="U-238" />
+        <nuclide ao="0.046007" name="O-16" />
+        <nuclide ao="0.00037503" name="U-235" />
+    </material>
+    <material id="10001" name="Borated Water">
+        <density units="g/cm3" value="0.740582" />
+        <nuclide ao="0.024732" name="O-16" />
+        <nuclide ao="8.0042e-06" name="B-10" />
+        <nuclide ao="0.049457" name="H-1" />
+    </material>
+    <material id="10002" name="Zircaloy">
+        <density units="g/cm3" value="6.55" />
+        <nuclide ao="0.0072758" name="Zr-90" />
+    </material>
+</materials>
diff --git a/docs/source/pythonapi/examples/plots.xml b/docs/source/pythonapi/examples/plots.xml
new file mode 100644
index 0000000000..512070a33f
--- /dev/null
+++ b/docs/source/pythonapi/examples/plots.xml
@@ -0,0 +1,8 @@
+<?xml version='1.0' encoding='utf-8'?>
+<plots>
+    <plot basis="xy" color="mat" filename="materials-xy" id="1" type="slice">
+        <origin>0 0 0</origin>
+        <width>21.5 21.5</width>
+        <pixels>250 250</pixels>
+    </plot>
+</plots>
diff --git a/docs/source/pythonapi/examples/settings.xml b/docs/source/pythonapi/examples/settings.xml
new file mode 100644
index 0000000000..26a23e9421
--- /dev/null
+++ b/docs/source/pythonapi/examples/settings.xml
@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='utf-8'?>
+<settings>
+    <eigenvalue>
+        <particles>2500</particles>
+        <batches>20</batches>
+        <inactive>5</inactive>
+    </eigenvalue>
+    <source>
+        <space type="box">
+            <parameters>-10.71 -10.71 -10 10.71 10.71 10.0</parameters>
+        </space>
+    </source>
+    <output>
+        <tallies>false</tallies>
+        <summary>true</summary>
+    </output>
+    <trigger>
+        <active>true</active>
+        <max_batches>200</max_batches>
+    </trigger>
+</settings>
diff --git a/docs/source/pythonapi/examples/tallies.xml b/docs/source/pythonapi/examples/tallies.xml
new file mode 100644
index 0000000000..61873a91d7
--- /dev/null
+++ b/docs/source/pythonapi/examples/tallies.xml
@@ -0,0 +1,23 @@
+<?xml version='1.0' encoding='utf-8'?>
+<tallies>
+    <mesh id="1" type="regular">
+        <dimension>17 17</dimension>
+        <lower_left>-10.71 -10.71</lower_left>
+        <width>1.26 1.26</width>
+    </mesh>
+    <tally id="10000" name="mesh tally">
+        <filter bins="1" type="mesh" />
+        <filter bins="0.0 6.25e-07 20.0" type="energy" />
+        <scores>fission nu-fission</scores>
+    </tally>
+    <tally id="10001" name="cell tally">
+        <filter bins="10000" type="cell" />
+        <nuclides>U-235 U-238</nuclides>
+        <scores>scatter-y2</scores>
+    </tally>
+    <tally id="10002" name="distribcell tally">
+        <filter bins="10002" type="distribcell" />
+        <scores>absorption scatter</scores>
+        <trigger scores="absorption" threshold="5e-05" type="std_dev" />
+    </tally>
+</tallies>
diff --git a/docs/source/pythonapi/examples/tracks/128_angles_0.1_cm_spacing.data b/docs/source/pythonapi/examples/tracks/128_angles_0.1_cm_spacing.data
new file mode 100644
index 0000000000000000000000000000000000000000..bbe6462a6c3b6855689590a0aaa161a18abec43c
GIT binary patch
literal 108911
zcmd^od%RplnQcn~LQn~c3d+@E<Pn||LV^f^-8_w6kT>E8H;ot>xrj*6LB{#nijVu_
z`ntY&&P<Q!s31(n8<~K>ZkPlDnvjH(2Z3NGCV)XPB7%;<+^XKSYJcnNuTS^x(@p<z
z`^TYkPWP%+kFVCM+Piku&J#+dNjn@f_reS39X4r)=08T>eeB2)BL_`$ul+|ZI`^Y<
z{ci^zvggS0pO|~${v&T6x#S}koj=e0(S7{(k$H2^yYyq1gkLZH)W!bWCmwbBai_lf
zs1x=d`S3?Byl~_rAIj5nfKOcV;d9TM>k$X-kKf#P{2vYotSvcl-;_By=E8G7G_IUX
zZ)QEuiTgd|E94|(q?sW{-jX2)kQqAhV;`D($+@l~#+55aG<N;?Tv@p}IOgV(kA3XY
zk@H-0c9oIi-+h8>q)yE=!>Sxt0nN&B)IL}4JI!BbHtTBA4rg5Skx$OOWZv9nRN<E_
zvht{U@5e5hyZ=ZCn$zBW;>jl*=d<mzAHu``)1jKbITlCeT7r`cEfrd$Ly|55m88o}
zs8#>wO0~ldrE;lMy7n6Xx-EH)`?vqu$^A?YKRb)}*SdeppVx)o{k#0}-@#|{`!X%0
z@43K>_hIqB!sW&PY~y~MRy2Pmx_AGxt^3(7{Jhe=`=9N@&kpY0|4b4;JGy`4=T+|C
z^5@m=_aZ+M>;H{({k!BuK9Dcu6Z!UKKzUF;Usja6U7lVpe&l0V_3x^p^1shIFLCdU
zHE%hs`TqPJA8fvV|L9Zw`^aHGJjK7))8C!x-%Eeq=KcP?_Ti_`_3w?vkDlE8{K6xf
zf3M&7=jMB*@vf8n-$&-W@vocT-}tZ1_r@pBIidOcW4C1Kg!lOO@IBy=4$`d$9`GU`
z$QSa7d^bWl8YovNC(4cY|6j}Rny6IT=j^ZD^T(;1((s<__4S!we(t)B=>wlS>e^F(
z@PB=KHT#TvYs@%wQ?m2k{x3NW-v>U~I>G(-%QpCDTk!Zk@YCzp&;7%LYYFfBuX|M|
z-rI<H|A)<!S0=A@`SE?py=t3}Ssy<~xegBLA^j}BD=B@i74B8N{({vJ?|!dr|GS@2
z`ZxT|!^vdF=liVjd3mQdJQVTZ2Os#e@-4CW8|U1=JmNjUn`bYO{PpVMUrB!bd3EXX
zUqn3kXEe*dB)0FN&EFSV{FQ5$J`nMazCQQg|4s7O=AHV4<kz2<*FJM!#DgDvD8Db4
zYpOeBe4+kdoSNg^m&*IyJzw(IzwqRfl3#ybIe+H8E&NS7_doDY%gUb^{Dkj;zbf;O
z@`I20mstE%e~w?*Z>RdF_GA7f3HbMD_V1MzKgEx)w}SCU@e6+Nfj{(bi=X<Bqc7V3
zsQ-c=eBeJa(<kB&`a=5Q%dhl>^atr9J*2;9rk|94&?l##t@?-Wd%jX>^(>?#<1@$S
z`kQ?}#&zu9&|}~+&T!xFNxvE2n*UDv?eT-uZ=XK&V;K4^_$mH<`xNXy)c+7)o%CDq
zQ~!7LMfHR92mGD%Tkw<qIex9r1JQ56KNS5I{8WEE)IYT!>Ob?3_WCXODSjM((fFhI
z1%D^~7W_leZ_htS{r2hmANT4>zZswF_rA?>_b7b1MZb@mdtGJ1mH&}o&g%JZo;#|>
zH>1GeJ%Juu_|IScw8C#n;TNI36O6wt{LOPa>p#Z35)XYYUH53@cjXyL4__?DcjY<f
zE|%lFmd|JJv?}5epL%=`y)^ji>(}S?=lH94+<L3zFU{CxgXGtrm-oJ4SqnePi~0-W
zz0}}uJij}Q@5}q$^b^Tn{?g-{CBOc>`i@(cwD6<6;CJO}z6}1_jb$F+U;73c-#1pD
zN#pCf`n<aA^49US_6Ll24gS)!ooReu+w1!@z8|@Kw_nTh>(2>~_D6Y9{!kx@!B6>j
zI9<L@<)``sKgtXK5DzB5Y(K}Z+qYBuQ~WT0?hhF68s(?>b^JQMJH<csAMk5`z<Ai=
zm;KlAxAgB0{l6;p1N<m2>L252$q)Uu^b7f&#(GTc2fU@9;CoAkk2-Ag=lZkp@?CCu
z*M@Zo%7OetkH2}_xBmIAS1wJww*~&vl<)jJ_J8;1=1b#4c~S#ky=H#yKY<_l#e39$
z17BWs#P1_Nc#&V^KdX<G#2@^5<i(3NM!d`X$nM`-CH1d*(#dP%=SUxZhV;XDh|&-K
zQeM2{x`=n_*V573W%`xU#79V9)aTXm>|CG0ul)u3F6$@omkxh0zy9O+D@RVI>o<+7
zCT)`Z`ty;6H{Boe4}R@0%|<WPW*PkDb5DFQ;@$V^PyC4W{d?#0^&9nh<#$iF>bv%r
zp!bQv-`MGyJpZ15b4vPN`q>ut7ybE`y>ov+`L(}5-wpnf#P`5Y`3HYi-*KKDu8*#?
z%1`yzL;X|xfnWOz^v)<h#gF6H@zp8*D1Mng_ZR4;!B73i@fYoX)PKRR{RMg}`Eh+g
z>WAak`a=4H^iiKmkEwlw{+jxS`fz;iRg2eeWc~u4^cVan&$`SHq7EB)(tnlTh=U#j
z@9%+)$3Fy~^53n02)tQ;$Zx2RMEi%w57Iw;`or`O!B73qWvgiarT&lj>f|4SpY+G^
zzbyVC_(^{~zxIbg_=n&hihl_Hq4<a3r}*h1{wRJCe__0qpnpRzr9R>MfE<50{+Go+
zeEA3IA3pu@_=mug{-S<6`G>%he;he!%?%eH@fg~r#XmND^q6C=d(%USZ<~<+#+`3m
z9LJYaoAaGTEqILAE&TO2{8Hn=i}yJHFz}U|&)E|3A^*VPJ^F`%FW-CVGZBya)Bcl<
z2bQD~AL6t2^Zn@lbNv^q@0Rn6@^&9zF30!!^Xga96)pUzFZ2)0FAV<DWf$i2BiAgY
z5AVj;uWtD%UBA+wS2sMHU;jb*_58-C>t6<c{jAs1{HFYmSJ3sV(vfd{T$W#d-uS^c
zTF3X=pD@2L_^Z=z&9A??ELNU>4b5*#|8gG9FZAcN11@Og*Yg|9FAV;Xiyx->jlMqB
z>G~DnQU7{=6Y3)|_$mKAl%MJk{JyRI3-O2Xu)$C5=ODU$JGDQ>5BT-`2L531Q~dfo
z7mR=EKg^%cZ=k0ZzwEz`Uia@#{h#y${FvVy&3a7j5C5?A3+=T(>#>C={RBVidrF3n
zIx5Q#{g?U;JnHMvEdOKTrGK>ZpTF~$#V+5NZurN&Zur_&qlsV77x+isR_^RS@C5^3
zKd8~!f4=zCDGT57g*6s`b)T<y_MfG{@UP{B$N1ub)f=MzyJFRDnRK7@kNTGmcqD#~
z`bB+&-;?aV(IQG8^Orf><mGeeH}1LfPMLn=FE6Z?`m8@M&7RVF{R{O8{zh}2dZWc(
zedqCOV*VX}`T48q`d8(l^Jx8&{=9z53Aw(a{9g#|q4*QozM=e$(d}1C{>nKIkUxw(
zGJ~#v>CYSAKBd(k(4OGOxX0ix@AGWF{>qns>pgV+t2}Qr`IG*<Hf2HU{T;M7_?zMN
zi{)1N3Eu-h<sbEr_6C3G9~M8=pX1l{+p+#-`zihe{Ll@f{waQXh(C&7@T0xKANr$J
ze(FDtU-z$0{jV(hFZj{kE&d?%G3X2FhvV1!QkD9H^go~VuOz$w5y$gXzM#LPf54+X
zg8$_DFY*`gq`$zUKDExs_O<l?v|oMyx<w-m#6{$VUhcTp^M5+(*oPCpE<E5%t1i1c
z>ci<x{PGq&@?qes$xOPx;8Kp`rpOQfF!1F`Yc^|s;P9S6Zw!3>(r@PX@3Z_jfWv!&
zc98g>kJXKf^YyVV>y=Y3A^&N-?LBu%f6$+gY_qC${(|}r?U`&1{$TN+w~p@rSFia4
z&0lKwu4zbq{ds-${MPvk+6(;4GycTjZzS)h^}XeFx6%BiK7R$@e^;NEW^UW6&)T2%
z2;(q=zk2vhdHuQiuYY(q@~7I=Q^_A%K40-)t^9}=l>dRIU@W)FU-{?N<WEKCFN8<`
z)&BIkpeIK8Ycl^ml%MJk{Mw(OM+QH&pW`pu{uDooKSBLN&kTNwU&pWGyHosEW&Z&`
z{OJtVL#zF%|2lr%zdQAR(hu;%pUz@EC4T6?)Gy%SKQ2G+H9y`zk@Xkwq@Tc}y|eN!
zk2+}JNxy+ddnrA&@=yMe^}F`|bJEYw-S+$+uTT8*Nyz_aUwv29|E%3w*MC9J41DQr
zSLXVa#r^GwyI5}ckAbgWyd=N>9`L~7Jz19NM{3|lR{ZyT{*%>T>-sb3fy9ULN$G^g
z>H1Z9#c8YM{G@u^hw}9ip?;AsyhneL=?8zSzcS6|Pp;alyI#fj|F1ij?*Hr0OHY10
z*GCl}kstnI@K?6~H1XF@nZWa(#c!hf|N8Ul*S56kJK`baCxO2h{N?A;e0`iNfBlYs
zA%7{|a3Rfq^yech|F-k|3;ts8mzI2r{H=5i-~X?cpCW&2`TWtXt@W?{4gO;AS0&z+
zza{++{FHyRKjInne^|IqWAIb`^-%xRe&E;s2E8))DSkYE!T6*2Rs6|=O<jn3ml*ui
ze;mK=UzHC1kNPk8;cwZvHtHqu<NAu!567?dh4csM!@sg|Yt&OpKj^oif16VHSEdWM
zN1c%M1OJoy3x4=l_IuP*i=Xr#c*KL!OAB9?{?o00`R8oM<6i<#`R~@h1imN#5_qHi
zVtvPULw`s6dHf*#%cnm~{}TMv|6R6<>Idl$;<J-~34YQ)&;N4xm*6M;cl<^DgZu~O
z@8n;CpYT2KQ~tq^cn-fO+P?(<Q2a~qQ~db$e>wb1@DIhmJpUm5%cnmc{}Oo8U&L1@
z{}Oo8f8aa$m%x*Mxtm1(PEmq%5Z|YLZq}YlPTQFN=wpwa^!+It6TfFfD1Y^clYSQG
zU(I3Mq%|%0Q~%+BRS%!K-olSu^mqCEWP87S!ri~o{4dPhIOpvzt+McyFYZkDe_YO5
zuOGg*$-mUX*U#AeM9lxIGJg0L-jmr){GEgk@l~6CMm~S^-0Jz(`t(=j^M_DBNEh$T
z{Q&$tUDj{#uX1f}j(5oyeSWub)DQFV|Lm-N!Hf5#l9ewp`0Iy1_i(HqU%rCRUzRRE
zwDtPp=^>sFUuS3SWAQhB`g`Ip`ut_-HOJ@WM_irO<Xa!hzs(`d_%ivw`=dNQUGa-P
ze_4Lr?XCC!UJCJy@}HUI$Koe^5Bv?8f0RG#k4t0u-<P$A#ZUF;_>0y*wIBFT&f+aS
zhV{nem+|BHi^d<tFZg{r{xz}L-=khx{M3IOq-g)6{tNz4{v_j%dPn?0Ur0ZEo|V3k
z{viF+Lx1w$ce-*%_&cSK`IFQ?;6r>SlUWZfJn1j+LGKf#cNU)XANb%mN${f>r&6CR
z|LNAh{JuvPzFYqic*=jb{w45Kf6eA{|3f{5_eA@b!1v@|9zRI`^63xLzXU(^e_y{Z
zhkprv(mzLER6j|75f`2OOY%$ocl<Ale+mAf_?O_P`s<<osr^v@o%~Dk55vC%|4{tP
z^AFO$eEQ?@FM%ihMf-O0FM%ih2fmYk2|Uf8{Oo7V4ejS&b0*f$+wHBJ62G5bD1YUO
z-!6>f^XUis*TV_&5#AHbzYKhJ%1`q3U9*}7xU2>LVi>O)`0}Qy`TDr*y7Gb+JjR;_
zzVy(8`TC83hu`BpL4Pyw^@Df(O)P&lZ(ar*-oyN=RFZi3)0Io}@_T(Kxc+?P>fhz-
zr<>J(@WbH6JMy0x{I&N#O7n}N>u+ll=j6{Xe=mz4@Zvr2FSYnf`+SDxS4Gz!mp}eo
z>-<X3?=YS;%3uE5D~MmOFYmbieA%yB=U3Vv(Vq?e(lJ+4{TE%oL3s2#J->q<82mMv
ze;0p6%TM(Oe)Kn`CszAY`#Jui?N9Loe)LzRM;1TDuj4Nq|FZvp->2hWO3y5Q>c0+B
zwEvf-et;kIJEe!j5C4+-1w7_&+4{i+u^-F$33$>^;L+cd9$NgQ-@v24g!UVYpZo)O
z#CwRpvGC+yDqbV*u77&dU#;I`WBSc46HdAOs?CYtXEv0-QC@Ld)PEIk5x?@p4^BSo
zosU}h`qs1a=WkTJMEu^(^=G3NzP4ma{``_^?}-1;(aV0l*Fj4xe0|re9*_BN>wnF4
zK=TP7##bXBc!;hKmRC$$D%XFMUvpFbxr&FFzige+{6yAo@W<*q#Pe0I+H03QbB9d7
z^qFnf%Jqf%^UAhYERE%B=Z|g?kgp$$zww@fNuMi!{v@scsD1UzwEkUxUOBs-`%^oA
z%<kumTKx63lgOWHm)%3_KSuUEiq?O$e17@|Tm1>~9QsSLI*U(>zq-R@;;+o$_3xG2
z9;fvm`t$Nfx6A7f{qv#FAHaWi*1s%%!n^j@>38C%{DVJxA5B$%xA;e7{rUJSSpU?1
z;D0If#{-)I8OO^OKgEwPf5G^p_yvFHZ)x^?PaJQX{IdV_(Eq6aD*j~Grmn^DI`Id6
zA^mXtT3<+ikp2r<{U%D!D1G>!)IZ?SAG7uOaXfF~Nq>P4dY>r0vGAn-z^9=<e4oeD
z7M}d)xBfAwr&{N4_26H3P1x>-ht7MVxlev5f3@-EeE!yM|B2DiUk!Za$zAgK%hOH%
z6$#1_-oyI!(bT}#)=qgW>ho`!_`6&1L7y#r<wLvX^EVeC?iKgzi2hOu{$=o2&wlGu
zk$+3Z4;<c;lQVoG@$jd$kL3F5$jj^g?H=h*jT;v%mHwnZuN-}UzQ0d%ne|gEz>D|f
zPa&QS{?gyir1g3AUEf3N?<?y+N6!!I&r3HwoBLySJ7gVr@gDlos8#;jSB}p0-Ic$x
z``2mx{m86W)APgn^TsFsBd@=#{WpLY?+N;oQU3a>Kk@q0xjU0TmcB8E{Hd%yuP>dM
z=O1ya{qfGw9}WJ>AOAx9MdxpX2S5B#^=GU8DgQqHRQWoVU)CS^v-i>T@#gLLxSyHD
zPwm%3`&0aYAO4udL(~(CpW@f?>-g>%|FZvpAO5(N^~mC<{_E?%VE?a5{ZRbzx>5K$
z@k76*egO~vdy@6c!jpai5C04GAN!$<|G-cB4Ltg5wjMC*iODbh19<qK(gO=m{-yd$
z%(wPGe?AN9uNVIl_@4Yv;Hmzy@^<z=fv5I!#d5FC{wMG~`JcxR)BgnjQ2bBulYY5s
z(f&3N{}cQ}@jt;&{^f(O;Qp_KNB{5Se}aD~{wMf{;(vmFDE=q-hvI*pANt*k{|P+l
zC*rS@{|P+lH}IYOPvFTvfbZmg0#E)29MTEz34HXDGe1|lYx$PMpIwIflm3T%Ydn11
zz*GKFZyJwrgn_5}!?;D`F^)0t)PA^*sPV42&6j~E|HHUX<1r4D_~3tijem@LHGinT
z#NZ!5|8ISM0@no${=VuTbYGW0n-_1e%HLQ0SM$CU^S+QDi=X_<1zBJG5B*j3M~i<T
z{*UVb+4Zyh`7ERT`#SzXyW=_tu6vA8|9u_*fgjg_aNTDNewx3z_AfgBBmDq>rdG9C
zxNc?fL%%Km%i`zm1lP^Rz>|K0AJ_5r3-_JIz>|Ih552&3!!hvWAHZWChk4r=_@4aF
zpW})8>&5>Bp7P(V{|P+RU$_1z@YH_Y`k%n}<bNJNO#c)7L-9YsKNSBH{6q0S!9NuL
z6Z}K*Kfyl~{}cQ}@jt;o6#w)5(C=RSPvA*E;Xj@HPvA+vf$!vh0#E({d?)`C_^$j9
z>kj_$W1oNDr+@sL#Gh#$>W}Ups_|yLeu{NC2A=L;w(~!?$&0(yzAQEHbpN!S|KUEa
zfv5E=?ffs`6N&HT{&KtdVJIJ^4}a|E{quJ7L##WJ<paN5f8v_G59<e7=ZE1wwN?JU
zuAk8JLv_8w;_vJF5j{Ut{l(&^^(Vgm`>}oo{aMe?jP|GXCyu}9`W0$F=o8j8sQzk|
zpVpuB5P!7(1^ie?rsroy`Dy)$FaLPfkAWY0r1XHw-^=<qm42f7JEb4=oAeKOtRoEZ
z5p`VFPr#G@0uMb2@jVuv^dESvt5W^N%0KxJ)@>r4@ScS9(iLYcId=UXPbaT)4H@!J
z>o>7(RO8`a2A<ZBV%@67!@mqXtzX5uS&hd!S_4n(XR&Tq<KbTho}NE&)zW-vJl1(h
zeDH_9u0O`QYt4^!ZU%o}*I#4Zx#mYa8vK1-f3DWur)PxcnnQjPgTJrq@6~e$DW2;d
zgP)!saKTgb`X%Aja~EkTJl8%3e|ZqkU%($#f3)hKo*!`KFZ%oe#Sh{R{&-gQoOv=v
z`TP3(4fx@YnHt3P09N_w`2qL+qR$_Yet;kTsPusN;a}GC2hh6=pYIbO`%l1=eu5wV
zhv&wu`VV;0Z{Xp7!B3+98T{lQz(a3>pN)kl|7z!d$A^70j{W25KmOt5t;sH~p+f%Y
z`Mq}j7oICm4Lm(R*v|j3FNuMt=NDCfi{%b+c!z<f=f~UmAD(NM_%OaIv_C<XkJjhg
zv-H;_GX3C>eSLma^@mtL$Ax_;41U_b#OJ@@^W*gVx%NlxPZq!2zr@iOeSVytU)KJp
z{mJ0(>+{>%AF=NW^uge#{YzZ=$MyWW_Q%X0mL_BI4`Tlr?8Bq|$tXX?PY>}&@e6%~
z9{Kd#kR$F7Z1B_mCGN{b_dlWj3x4Ps_Eoa#Kj;hXZ{l;S_CF#0LHhoC{-ym(mJj}C
z?SBHj)Ba`PNq@l~>Nh@jZIv(Zll}vbeN41}8T{lw-TK$-UEPewzXYE0->rWMJk?*f
z{w44|`IpBJ(!YHA!}Kq~PyOFz>t*pT$v+JL68uB)FTp<)|C0Q}@GrqX6#o+ZL-8-q
zKS=-b>5s?11fKL4{?p071fKLC_)h*M@Z?|Ew-V`u_i%noBR%%6r@pb_*54;@$jeXr
zS7!6>*7G;9j>f>#{+ZZ!TJwi}l`VeSzZ3gjx4|a{Kkc8K&Aa1yL2-VvSGEp_@FBiv
ze}7jkWA4wLmE%T?cVqfL5BreI{00B&>;A2QAH1n*Zz^Bl@9X}x+5OQ)kzd7&#oyQc
zd)2<hDbD>uoE!Du*ZqstxjJb$mjdx%m7n%McJVc?{hLF5$NJajD;nkR>;Bat-Xedt
zKYi>ER{00Ae>e7(59eMWKNdgj-|wow=>GrIe_5AC({S#E$shEE_V+jRh4csMLob6K
zn(1Ty(|Z2NrZnJ_pvPn3Nq@ng>F8*ZU59*ZEIjEy@Yu&+#S67h$Upgy(zD2m_C|ca
z(N&~{S9%oj+P?&z^53n02|U$bxBeyYJ^7c%57NJU`or`u!9NuL68uB)FTp<){}TK|
z@h`zY6#o+ZL-8-cKNSD+{Dbr_pZ<9KOW;X=;Xj@HOW;ZWf$!vB0^gN?;T*T`oVVTT
zEz6%tcFoIA=eM=<uk2jW<*9+E^W)n2m!os9g|iGionP0^zs?Tl=oxrA|Fhlv>-|l9
zBa!&vFMU1#PtVUjm7Uw2gm$&~`+EMNo}b}dlQH=Fdj6xHpW$4xG5Gs>{$<v0mSfzN
z;#{^d`04yk7o<hkZxCM3&u}i?82og8r{ixq-?Yg2r+R)?59hv)!B6LRI{u>Pe^UIY
z@pf8j{^3TnhZX;Hey8Ivdj2Q%pHR*edKb=b9+Q6%=l^E>%hT+9xEPOA{@_2PU&z0!
zhvw@`*}1W1{xScM=O+Un_!AWm7C-4X@Hj_WwWozA|7bUVLOv>Axcq;<@r6GmySdWA
zf8SPK9QTiE=RY{V*}&8J+3oxX=Xe`<I={P}{~%uyAI2wz&KKAIr0Oe?>0|ygdrH2)
zldHCIou97#3FQjyZt?f^{CMq8`udqs{>HaYxi7|tD}Uvj2WWq)kw<3G{*C(c#_0C>
z{%YEvRC`<HuT5EypFisO%UgN>#`3()yg!!ye4l6Y{VTOUsd%vX%M#xMKjmNhlZpq6
zpX#rd`j_no9e~cLc(C}Z?>v5uZ2$7}SJVEXm50uw{X_NV6u(N(QWXyte|gR}`Tppx
z{6+g;N%miq8}*>#f%tKK<$=|7K344(cfQtZ_m28W`h)aCT&1eLDgB_oq<;$E;vceq
z!oLn`<n;qQbVb#-#XlnTf6uSa{PJ_xZA_3(cu%tR*N>&OQ|4W9`Ujp(-sBo0@Hg&!
zqwtTd6OyeHe%XS@by5p|{SA5kr`NBa`-cbDw&2lE4SeP1bMo___h{ySWeYyr2lKJS
zz?bj6^qCmn)0+HCB3{)8;c<WEE4;sN(e<abpYNCNf1L3zjQmG(eVY6mp3Tn(bInq8
z|L@Xe7t;QJK8bjKj%p8!zwv`_kUtb%e_TK7_4)qMhc@efVT$<Mi`&!UuN`m!@fY3y
zy*mBY{QQ9#S^G!+@H^VW;vc#A;rx7RS9L|_FN6=}jr^fL#^R^^JN}~Or}{fM>wl5o
z$AW)B2W0;V@lWmNzFM^XDSn)Ic>Rd{p+DevtNvT!_rtr<{-LE?eoFg?>i$uc{U@vc
zjo?eO_+NtGEq?01uKY#&e^u%S;vW8#>CZ}&Kj<&%7x3_((0|9mlYT0E67***d_(Ft
z@bDj1pHzRAe<;0;yz8=kJk!U&y>oTKXaAVI*;RDFm!^CtKfgoiWyHI$yVv|#2EKaD
z{7q5+mEJ`>o`*K@<yA-gKH|0isPZHdkMYGxCzJk;?EbA)a(prJ;zb){`r4mVc`1GP
zQ+YPcUux;-?K1sJY2qVte_#E1dGU_x6o2kds=h4#k%c#rK30yLOykGKRg*SJe*Jmr
z@CS2$$l5XLQL6nx)^8|(<#$it8}sk*^(THr^Owf=&Zqf{{=9tdiTVD<+MiT=SmiHm
z*_-^SzB!#Q>%a7~Ei`}8pEq`TCa*v3Pinki@e|&czaT&5U;C444~w7buZQ}l_S62P
z+QZ`4@uTCbQ~Xi<YJbxHV8kEwA6I_ezdH55s_ef?PZ9r7rzC&S7t#;Mul1!W^#}SL
z^e*_{S~Gq4kJLZl5f`eysC@#S^cQ&OttzjDC;eA?8}qIGV|SOq@%V?pQ~s46Mt+nB
z?IZ9#`G?03(m#Cq!}JfqPyNqjt7!k#{of_g**^q7>5qeIe;9~=2!7IE&tFi#N&ma`
z55Z6P9{4H$-TH^%ABuknejPtW<B#H3>0!(KLh3{4e?##PU;aV*hfjYz{vq(Bzuo$W
zz<1>zZw~tiUR<B{<n8mHOa5D)|HjR8^Ya(fcs%O=VPXBTh5!83Psj18_7CM}iG{y;
z?z0iE=O2fu>qiog_?o>_e!i6})<}BzVmUr7&pCIo9G~mYtEKB6jr?jnoF156Pe?+$
zQ2xQc_XYX&7sp?{<5r%(&)9|L@A~ul`t^DJtMPEE>cir%zT+0Yzp&p;bpA*AOOJ1s
z<u9wx8_(}f^D9?`++S3EnEcBw=lRLCZ{YdK>N9zMpgynNSkABisqt_+HM^cRR{fWz
z?M(BNqSvnoul=Q28Kqi0Ki!Bw%D?-5U6rrVq5M@@f7)MEeOUFc+fTP|r}n4#vF9iG
z^&_MF6u++gI=)LC;=e5WkM@_T+4a+?Lk2(fU&pWecc=beminQ_>uDAb`TRlh2mN>Y
znd=wyJ9{5Z%X~eM+7EcCpTKALl|~bl9}_S2Tj_1Aw=9kuvp)U$+P+_W;`!t)?hoLf
zacF-1NbA2!FR}4?`L+J5^avmPxwiS3^-+I)KGpNR)rt4!_ZO5Nw&=6WAM|;rH_-K$
zqR%f^ufJe*%%9T3bc(vZZ}3-_F3<1Z`tlXrKcI2W{kcACf7m~}-XHbR;4iOzhV-%M
z{sEP1m*)EH^Y34XQ?1Vif93p{<PSxk-><$nHP64&!!*lHuFnQP;obL(@>Bk`KdAgr
ze24hc^;fk1sr|G+9Fnzv?B_=LDSmu?6^uWMU+oWCpACNMKaRd=|0~P>tNlUiv*gG1
z1*spt{7PR)f0W*)M=AZ5>F4^H>mT}s=kYI<9>qtF&-GX7ZEV*pwOqg7>i%HimENW*
zy~xk_JpbM5x5p1szkT|{)NjF0@$cKAVE>{1*R6gFe(L{@zNmg^{qaTUsNaI0^v^+y
z>L=;1(#y1&88N;_{}TL!?}4B4->rTNeqDb>>z~@MTm2UN6hFSc3dSGBZ@2m__=lq3
zo_~<~?bFZoGuOXv^_%gzek;9)ey6_ON~K3<EjaeczrXnG|4c^QZ#jRC*Z!7`cjNv1
z#K!0O*X?__@-K<+MZb0YhU+6JC*^Mt`mOtK7=Mq&Px0?tp<w@^{-^aTjK9a?r~dEg
zi|U8gA76y1-y_-ek+Jwm{~UB&`mOz|nHje(A@m!o{rjrldj3^b*N0?$4`TeS=bu?T
z#PxPo`6+&UeHDy9ieEiG+gHs$jq>+ZzxDVsn}5Xhj#U0$^jnQr)1%e(Us=9fKXd&<
z9A<G@D(&5@pST{B@|WXt{q0u2-{uG`e7E||_&opJ>bJ)aQonur!_;rVPx0^DwP63D
z{@1O33;v<#x8NU&ehdDg=(ph4{#VpLsr|auZ^2LT(?k4G{C2C~f`2Ib?fD0(-#-0U
z_{wz8L(Did*S~J{oAI6XdrG+fS-<9e^~1mUmt=|~2EV+1uJs%9fpWP2Y2oGdd#&Gk
z{BGgp{R2I|4);If_)g-X&+`6-D^}6_A9VjjkFWLk-r|?{ZybNo`#*I5Nb9p6-y8gN
z|H|<fz5k`}pSdLR@pX26JHP*B@yq*n4qEj7AKgFH<7+*>H~8uPrQ;vh{ZBo<_I2Uc
z9iv|w{FHz9<)Y=M`=45$_4wZ4*X>ud{V9I5KF?D3R}6lNUswL3@lW?Z_4rzk?+t$H
zzmC6X|EK$(di<@&_mV%?&sP1;;$^gD{BGf;ej?6r|5K0OExgq4cH{T#Il*=5dlr3i
z>L2cTA$hy2sE~hJKhsYC-Phe~;Vc7B>vy#N!#}oU>;Dr2PwOYO{%ik`c=)qi|LQWS
z*T>TOS*`C!sOv*A{opUOe%Ga6bp0=_|I+$?P_uvK_ty=6T7TyFi>_bO>)%`wxxT+$
ztuHY6`?`Ko>wD&}xxX0vwEoa#eO&7&wZ4b@w{d)7@b`87q}KOlV~G974gS8apVayu
z;xU2l82mbZipC$suh#d_AIIXS{^RPaX#b=BtMxtTjmaPMh4jPmYkjfS-zQjqul+;T
zZ_r=TKeR&@7p0QE{$t=te}Tt(b?qMpp7g(4|JcK2a6JAY@Ra{<{X^iX{<`%Kj~}Fe
z`1FVAAA+CypUYO!{;T`HOQN%X2>zk?hu|NIe+d4e_=n&hihl@x9Y00mkK(sm{}B8`
z@ej{GNdNHZkH<d*p7gg{{}A}D`~&;YetrAb@A=&)UrhGQ^H2Lvw3~lq*RK|(7G6HT
z+|EC+f02Qw=cl!Qg!)L2Z*B<xSYqJm`E5PF2;+@7zLa?QgM5D6RZG$5&*}MfJ--P3
zWlVng{Ji7W&)0W){=Vh;eV+#EEgNs=^Bbf5w10qu7Tte<_Ak)$i!k0EtNgTog5xi`
z{{rpbpywCi_p$hC{|Lul^!gRy_532#$5{N7{~pRu^{3|-E<N|k&sQ?qpW4rTxoG=S
z{AhpB^BaS|C4R@V|Ad}j==qJoPyN@Gzi9ur_MeFR4u$op33OfZ!$0KyIrtv-pV0Fc
z15f&?@YsK1EPiYM3FJS~^B04k{6p=Rgt$-PKg&m7eZ(){^-{8ztLRXE+CK^Vc0j-I
z4*xOmw11x3FDmjM+Pr_VC^7J~f0WwKD&pZk5+BAFw11WFY-)e2s@(rd?bnqyFUwt?
zudkBn2Y;gdw_N%~_wS<pztnzZY1m&C<)r!v{Ivg=<JbF>b=tp-_CHhmwWVQy)v@^d
zx_=(_!9rYx{Z+@}r~T)A`St#IMfT5A`}MV)e_*tKU-!?``%CKc9}NCM?4OsQ{=@#N
z_}z*>ik}|hkK$MDSD9j58uDZDQ~&9q|55)14|HyMGa#0m<;V3AsUMDC>kH`*(uaTO
z{V8Sp2K^=dQ~2lu_`888{l)jNf03$hs$Wb0+xbV>&o#aFxzDcLao&F=Zu>y^2kqaA
zdJXwNzfMoe_TRSfw0~?n|8R8fRi9<>)BfM>{NsOw{l5)7?Vqdt0p<8W*#BGNgFX*p
z|L<6Dmu35Z<M+hir~QjvB^BNOnD$TB{(yZG5myF3?ceP9i|+qS`$ubksH**o4gS9F
z|E>LDNv02D)j#du?aE(t{z7=|4<p&QX)OLh?Ejr0?&oLwe~-ma?bk#5Q~W5sN+&n}
zke|<Fv_Hjf5Ajd^2XT)5zh{JTEB<cr4`BcA1p9xlRQ@FSgMO2KA)l@uny>$r^&hk+
z=|{kmegd!d{~ilZ`VG9=|9dPv`A0kd$#lJuK6m1>E3Z7hRG#Wehx~u`)py0`bKCh(
zmakC@Pv>W}^Pfx?Z@2Jten&h13HZdwKb@b{&VMpp93?!)C&ztgG?w30OE>5Lp+Cp>
zP`{Ku=08t<oSt7Udj1%l|DydxwYSCJ*YlIKzo>Yz`1^W(lJ=J{K14fM{Czz?N&8DU
z|8Fe*L7bnI1f57RPKIvC{t@DD5a%aF{t%C2m46WDC&lwjRe!MBpZbsM-$nbMb^c!{
z|0wDo^+EhWUwS$JF9~|ra=xT&U(7#@^Z$TP^!&-dll~%(pqH2j;qL~X^dH}Y9;)#O
z)sN*rO3x5isrIjZ#_3-IPx<fGzXYD@uUr2T_@4aB;|J+qKK)_(m*5|Ye+mAf_?O@x
zihl|Iq4<~JABuko{-OAn;2(;AdHzBAmrs8@{w46Fzwn<<{w46F|G;<hFM+4?|4#qh
ztUZ^U7Vn2d|C+s_c_ASE<WF{c>0fqxMS0)6{B(Z%Y5#D*s)tWqA8{c+X*f^b!qfTj
zFU{OI=j|`8YQb;6=7x)pm~@|or}OJiZSpT|!Mp6bS8bM&|N0r5pNR9PlbiTETkw-J
z{zT$KeATDFiuNCD*<WV*8TtNESw8ah0jQr>HPc^1=?DL69Q8w*e-++8r#3gwUnpM!
zUcA3MYhR1MborsY|5L%|FYAXt_i(J=)3f%8{HJlenf$Lgp2}bJ`M<_bf1mS*_=@~l
zyu^65_{*=mJ>P%JwO`Ta=NsSsQ9eHpe34(pyTwoV9{4H$p}r%3Xpc0+fypoH&+!+n
z|B`G!@IX&ybAPk=DSmwaDHwkgzu<=+`SiRl;P0}3WBw`okNa}b{zv^6JXwFgFFh+O
zKiY%JAM~ZB^+WAnMf!vEo5gbfQ~iz75B^2^2Yk@mMD-U7Px=ddsNY1zyM-tH2mW0_
zk5s%`c=Dfa{cAs0H=+E5@7BKrp7O8yGx}Ak{Y&7f{<`%qfv5KC*1tS{kpAV<AEti^
ze(L`&TSfJQ^hfolw4HxReyM+szNmio<X?iH^xyHnEdC|<hvHw7e;EEH_$hvRh(C&7
z=wm1U68z<1_?PD&q<{JJ$KziDPx`Csx2=B(Jn291o%~DS$$#4U*Z17)XUz>8((k?T
zwG$Ry{fhGbdHE|>{B~g+U$^tG83+5<!xp|e<tO?1rtSR8-6V7quw@p$ylHBF{$V@+
z%GUWTu<)ga9^4%B-_F0X`S60oD1ZIn9e)$?zJK{wXou*(**b=0gb)5Sa`o?M|MsHm
zPs>*>&Fin-{OZ80{w@C6#5wu-Uq0^z*WcFO|7bqH(Efya@Uv$ZKNf%a<ImCjs_6RT
z(mtPQKfgLd&F^IUh5D~8`xVWvimpE||LqkyzZ!3*XEw*z`TWk{FCBArUVpCoi>}`w
zyc(~j+Z;mIGtByz`FH$9%TM(O{efQS`JGjM*?x|{X!}$AfWH~;PH)2e2K~?~KgF-(
zFC71}|A0Tc@3SoIyO{3}ZIqw-ucI&8|4Bc<AM`3!dO+oee@XpP_$0$Gjq^j9|9~g`
z1U_5uy{u*aX5dM`fuA1qO7$lz|KuOQLvK`nu<+zxcm30w{%ZXmt=Atzdg-*C&pYzb
z=U!1hz%^7Tf1|wOwy6IPo%q4YXT9@L#9MrymX*iC*SDUX?+>5le>CDkdD0od{|x@x
zk}3KA^e>HG_UpY4iqG@MbS5{~5iKzJcfIQInE$hy>kQ{d9QbEv_(bxD@m2XXH|5v&
zT(y)}Oj|0?KN<PJL;2?+{RHXa{j98flz!0X%C=W5jrnuw*DiVH4w-)GGuy6}=Zomi
ztM3r!3%`)nPYeH%A>L&9z<+j~{HgNiPty5|wXc4e&hOTrH{Nq_uJ71a1m(v2&A}fH
z{*lu^Nd8p2>>fJbWMt2y==??fd427q+@Drv@fpj18^^m<|K*Qvm*?Nre`N-rA78oc
zaXMc`e_q{Ta?YP-e3AcN?k^TU;d|hx{D=BZ;7_|Z<2v>?i=XPx$6vwvr}hIs{OL*V
zuNFVWk1v10_^ZhH1wZ_08uxdLpZbq4f5HAo{TKZ3r;9Uw!~^jMeIfmD{90c~e^mO(
z_N$tDXr>SUlllid{A>R#KE}e6{sIsGTFw29$_M^d{oj<pzf^y*@Z>-3{OdQTEPTrs
zp4yOp`l`2&{`{lcln-<j8ThM>H|O)WcK(I^Gz@&@$zAgKM^^sWpVCkt>2I6-D=hxn
z+9{7keQ)PqPdD**TlmU{cFpH+?flCX*S%_Y82PWB{nn=<e>;DAGUHDq9{zCj{rUN}
zj-<Tq-|mtA)VOiMQt40n^Xl41a(!>-PZ|FTi@$W!v*eHUUEf3Je^u6hj?VwmpO^lA
z=89PUcK-BO*gwiBf8!JXk>}r)zq0$+>HM#eS+9OvmS2Bf`^wR|zi59#{QNqLU#tA}
zr89H9um8C_lRuWeF^Bv~e_mhpr~LeA)!)+aJL1^lul(^ZIo=1^Uf-wliAOHq?bovW
z`g6iVKhR%;evHLW`R}Ftvi`uI-TqjY2K^h0pW3g7_NVv(e{<RRQ!7%pI9rZqt@@|<
zb^JQMJI254Kj7aI^roWx(TIQQzrOwp_Wz315AeHm+^aTA=@FG5`YrVf_$+?zPL!Tl
zc+yYcGre7rC_S+7q~E|}|0C6(Exh3$o07~gHYBP)T6prWZvF4CT<xO%dhtJjH}c=v
z{{)`uuUr2Ucxu0H{ZHU~@;{FsrvC~4q4=NRC;f8OqWx_k{wMf{;(vml{L72h%i({5
ze<=PZ_=n<uf`2IfC-{frf1V%u-HZPTJn1L=tCRl;Jn1*^o%~PW4gcuue*#bbhjC-b
z2gYqFd~xcJkKXry<0h1+iTacNhjE|AFAvvg3_Rr@<2H@oGhAme@Kk>ocWL}H;W~+d
zr}lHja<90aDwZGDISf4cAI43Z|FUqMLgIt}^)>zxcbb2fa2><o?`!`@+-m;pIn>d_
z;P0#cVce(rH-_sd2LC|xAN>XSSRAff8vFzCKU{~|oXvX?$5#FK)&E0zlk9yoU7gMQ
z$Kvnn_y_zL2REAKUojScU&nvo$2j`YFb~Avt@fAmHzz(t=YOOh;K97FDQ9lq3H)91
zkL7=u_dT2CKeXp2il2Zd{R9u@ea~d|KNg<!8+gq7l%AOUt=A7X#d)970}J1i{~hEi
z7WLPQ{|S6g{wMHMf8F|@z*GBW@zUA<1imN#^Y~%<pWq*g{|Ww~_@Ce(ivJ1zq4=NR
zABz78{-OAv;2(<r34XeM>15$$@juTG{kG<Ro%~PWNk8FVo%~PWNxy;b<bMKB{sBC$
zd$#jGfhYgNeeIAA#!YelH*flc`tEm3C{NGpkM1AhzO=?;{%7E6{R-|YYy4he{%7Fn
z{weMYYy7ie{%7Fp^8RhWW4sc}e`vUlFY&$HU&ei5oj=^img&PE<@ys>?c=(Cj{C}*
ze{z@~8vK1-KY;tvntyt@Pj2uJWc`GmpFI}lhX(&Z){kI*hI+vK(BP-_C$9bV`j|rN
zX98b{@6q(1!n$ny-QcJ7CqDiPu3w?{0}tkBdxdpv_`AVR>rZ_73$9<G_yrH<XZweB
zarnE%-_P}9;KBTC`)1rPfX*b6znArKNFV-{o%^={dPeC7|0Dea9{x2utgFM{W&Q%5
z^cUZQe;pFm#o_M;p7bBzgMWQLtZT#H4LtczJO9FS38no{|I3UwO)MYm0x9I5)^E1+
zuT#Q0Yy(g0N89<=3*otN15fK$+xgcCP5z~+fv5Ge?fk2pJ*R2m>G^|p{^Y95z2?u7
z{K234y8gJGKmARX|HR<$>-y_<{#428-{Pm|2V5ofW&JtgHN<_oUA7M2;x7+k{k?t;
z=dYXPUvKf#^8>E@MepAc9{pTD$Me4IISh-Ro*!`hMV~*Q`U5|n1JeFz#2-CB&_nxE
z{D2?N5$&t|(ctgv^Ecpk<!HX9DStHh>G=T%D*F5Z=?D1n+`+EOA0<Eh%X<C*&k<?=
zGw`IJ;Ky_0$149b@TA|s<GBOve+HiX19&`lp!A61-|{c)OAyk*xFUs~9Qc1uD4lxE
z#PST+PytWR?=_1%X-&i-olu_Cz|-@C*cSjeyuTRy&%o33i&@mQKL7UKOn)tYdVU<w
z{eu_p*r!4Ahw)XR{Ru+-U_2G;Da-f#Su%b2V?Uo?#dDb`7v3{}x-&8O2lD(b;tBj`
z2Y)p9>G^N34|D&W)>qc%ol4Ii=+DjlH?%*6=hUq7_x1VhP+mNj6x%;Mr)Tl^_4#%1
z!=F(9@JFNmss4JXe`-JQ!=H}HZup}ftn$<I-@cy|-2a5)7yLdQ|C*TXJ2VzQ?O);`
zMfX3U=g+|pf6DmpGx>wQ(EcVq&uae@(jTM`|MK6L=U2=2h5yO@pMZydVc#eG-N2Ln
z;(PEfrFYc6fuHmrc=(snD+^El)2)BabhR=b{}Oo0f4BZ6@Kk@z=5qfF^?<lYwSNhG
zPyXfcgY++-{xJPZ@KgWy^;=LsNPiHYo%~Dilm0n+?N0;oFUc?W-*Ws#_dg;3LHYIk
zO8b}KCwve5<iFtW<X?h+DE=k+`?-G{%J1s2`D*81f`2If<@pEcUq1cu_?N(w{-S<6
z`Io?x{sZ61zXYEA3;QI8bfW%aU*%i=c-6d%F5I?!NM3&0zcRzMuK&-j%RQDFc-lV`
z`&MiIE5bP>2A=ls4ERLjan6;2r~Q+&>yM)?c$~i`@gcqn?az&UL3RG>;hYbde(<k>
z?B9y^L_ToNhrvIP{cE%9%#X$R!Z{xXe_!|S4dqSrKHWIy!{G1h{>9+e`+Q#+&IvL2
z`?`NK__O;Xi(>sB-5e-CmKgkf-M<?ASwFoo@_!~fXUXF4>;Bz}Ke@koAVdTCu=r{J
zekXfH_y4E<3;s-J7A2XkM7<>bpfA-T=ZheHoO6+#Z+E*{KFoit{r_=J#gk24x;;U<
zGCtsc7cbcupP$9|LjO(<4EM$HcLPuQkMCjMf2EgHKY^e8r(6Ge$2k2<;3@yz`j^1>
z<X-~clYe>qApOgyKTQ7;{6q0C!9NuL68uB)FTp<){}TK|@h`zY6#o+ZL-8-qKS=-b
z>5s?11fKL4{?p071fKLC_)h*M@Z?`O_b#LZ-%c@Jf8XpqUqA29+m;W_%TMRG;oLfn
z$9UVo)A?~O+2%{*aZZ+jr}OJ@Zk@*CoGSxQ=jY+vI*rf95sOlZ5B^de#QA@yZ{%ZZ
zn4ekv=dF7*j(=R`6+QpcJpT~w1^#RtcVlAk_x1e8z}GTA+M_v+TV(O~_54fl>-kZb
zzgzrtey6MdqU$#Z4}LvA3g>iN{Cz$D6#ROA1U)j^pU&@e<saAiuZkbze&~-?ev027
z;-AhB1wZCT?`y7G&gW-F`TKhQFZeNk`s*hDa_BIXAM>9}zxj0R|G;DZ<m$t{7T$rs
z%lu>hGHFe|e-plk_Evgo@soZ75C2hmYT?O0wC;rT(EjPH_y2Ov4qw}@{7zRY`0v}w
zi(~miyP>|~JFfp3csf5D?G9eNhx)Ym>HKcg8*q64d9y*66CUG}Ud|WS{*bNjUqtES
z{?nXo^8J}zwKeX!^G@0y>n|^?mir^=&&NDJ9pwxDVDb0${P@7v;t#<e6WP9@{EgA=
z^Zn6W`77r<K<g()9+^SwC-moyZ=Z5sj4$wOf5`S}T4eE;_j#7~uPkrn{Ts{kHuL^i
z>hs!^1xs4^wLgUMjm1xRSN@{>lz)_8`vcBtwCZ2hUoZ79+fVUFe?Y%8`0J;faDS{n
zU;gK>ru{=J51mK*hw9HMe!;JG0(xigQ~z=Nx_>n~^uMy~zu<>I9F|=-h0am?2Yso3
z>3~OM`D?dKx=;51s?;B(5C2elO6dpvCH(^)?UC*Kz6kAP;YojiM|~n4{9V?srT^jk
zsE_!**Vku$`MK*hre~**JoSUSwksdz8Y18ucfPT+e;m1WLb7$jFHQXQH{|-N<09lc
zonF6w?jIgpYvC(5pR*;lk1B7>{~pc!ue9*xdoO(^;!#g1FZic5`Iitr=wt2Y`{nx=
zyJ{)A{<QiPvA-|)U1c@v3;a`?{0lAq(q$LY{(VLF|E_L$Hb0*X{0E2n2EQwpd(~#i
z_7CN+pY{5D|7Z85qU+BaKlnzgKV<d4GPd8LS@{!#zdHR^I)9+(`s>;O7qs%v2<?sX
zhu<y!k&7QDeJnbEAw23olsA??)Q81S`FHhSwER?m;P<WVUnu_}Sv*+$)P4?9wEZc5
zz@PQEg$ekBepvhzzdp|e&wrr)!~9Dk|K6GYnf$W<I{KphpY#L#L9Y^}$HX7>*VM0|
zmr0oSBaSRQ=_mM6-?(mozsvpy{g?WU@9i1tEBGtw(c&ln2>WdyzwsS<{Fx2=UhtVy
zURgfeRdnDlP5BO=|KVdG<RjwYKL);f&HPPK|J8mU5ue55+SI_8R~_;Dh)4O6U*rS+
zBk^H;G4kR?`TaMS^^x7bwTi|UC!L(@JJQ$waA43YnLg$(i+5ZX^XJm9rK7jY^ed%_
zkI4Cp{=8bAo$rqee(ewNCxgFq_=DsRl_Mw9__1--q)n1ve?GGCrd(gaul>Qdx%Vf7
zzkKeAw7+rvi67DYrSZM<Y5t-=ul(-mdt?29U;6|6$>4A7^h}<Am&y9(l=jyx{cH=(
zUs^ujvUjULX@7t}8T=)Q?}4B4kMjH4_OI}JIyD<#B?dp$pM&W7?NtBNe&E;s0Dm(0
zDSjNkj;~JfNAb)2xj#TJ4SwoBj$ik$PW`Ve`!D$652%0mljO(s5vd=JU+W9$57LK!
ztW*1E$@Jkrmj0nW9AEQ=bPYV|FTMx=2>c2DZs1A(yY-J*E?4964}qurck3Sl-;;lM
z{2=|qr$0>p5d75tT(*k#U+VveqfY)I_(^{pe^LD+{R4j|{}BA7zn=f)@DIU16#o$X
zRDV6xKeZp~zmtCmeu|$S;*a8&`P=)4;2(;Ac>Y29hfjYz{vq(Bzo_3%{vq(>9~nNb
z=ZoWijOQ19^02pj;McD#ACc$3ar4~#{08h>5%Ll7<#0X6!hini*85N3Lpm65Tlkyj
zKHD-r)$;@Box}%yua>T(``;t!;fv+`pgiZ?#d3V!^7-tY^7FA!|Hv=$54|(^>+9F&
z_2;U!ddIDF{zqxXE_D8f{=B^R1^M+K@T0uo$9UP`Z#=(yKEHAN<^67=^FPX8dVI4i
zzy7@Xj$2yqFQB~Ocj>xU?GA&#c4Ile{^q_^zxEA0KUsYy&kxk+)n%8r&QDNY@Q3+X
zV(^!y?VQgqd?pL-e@=MRzb~zSfgke|gP-#6AVteh^#^{f?;#$n@>Bace%-#E+MnWw
z`Ez~8c-kmG#joSn@!cu@ssDgq&kryjxA<lMb^I;;yF>pc{Qy788-7or$C5wjzthiF
z{X%}jzFg2zYCqsD{RH1z)cR$cpY+F7K_0irKlJ!LZ@VO|e}4P&k?uR-pK)k@{Rrj9
z_ko8V+xXV<<NLse`b;Gr{ygzsy8qDfeDCIC*0=bB)@SIYOdtMm{ROKd-W9v>^UFKE
zA;12^^^;%Uhh7@|jdSiNeJ=X^Wp(ND{Qfcc!H4>VUK;$BYnQS<7u-Lfy!M$~U%?MP
z@cWqa{$TJ|U!0ob-It0!e_1(yW~)Cm>D>Ro54|+_3Eu-h<san-AM-Cs41TIV$6xgM
zS86}z&-EF4Y4B70_<Ae&{4d2X_`!$rLoW^fvg|*OzG(le%Ki&}@PQwCEBS-I)TDm+
z@~iy=s#1TDKGH+_&|{f?uAi;?hwpp7QfX~me`Vuy{ms6g$2It&$G|7<i#dOeNB;4B
z;GxGhzBT{&KJZ$<J^vu}+owNF{TBQb|Gs?+_8;nhXrE5{E%>SbJNlyfLHYy!PWmnQ
zN&g)G%c9?ce<=Db_^JMSsDEld)PLq5?e$ymQ~WsoqVY%Z3;s^}E%=9`-=2Sv`t8%t
z^|Mv~I_Wp#bN%&s-rN10@!ofzIda6vw2{L`!aon1=3egCV~#uF1ouhv*U~obt3Q6=
z(eo~zaBq6iHx8Mz;H#_CogKdGB&K)&)q|P^F8{-K=im0}pQRJ`J%68LKmKU?+9GTR
lb<gHExGt4mJ#Esz?)f*59C6Znzk1Ifr*29o7h#)L`hVO>x6l9p

literal 0
HcmV?d00001

diff --git a/openmc/opencg_compatible.py b/openmc/opencg_compatible.py
index 000801ca2a..a6f90818f9 100644
--- a/openmc/opencg_compatible.py
+++ b/openmc/opencg_compatible.py
@@ -213,42 +213,42 @@ def get_opencg_surface(openmc_surface):
     opencg_surface = None
 
     if openmc_surface.type == 'plane':
-        A = openmc_surface.coeffs['A']
-        B = openmc_surface.coeffs['B']
-        C = openmc_surface.coeffs['C']
-        D = openmc_surface.coeffs['D']
+        A = openmc_surface.a
+        B = openmc_surface.b
+        C = openmc_surface.c
+        D = openmc_surface.d
         opencg_surface = opencg.Plane(surface_id, name, boundary, A, B, C, D)
 
     elif openmc_surface.type == 'x-plane':
-        x0 = openmc_surface.coeffs['x0']
+        x0 = openmc_surface.y0
         opencg_surface = opencg.XPlane(surface_id, name, boundary, x0)
 
     elif openmc_surface.type == 'y-plane':
-        y0 = openmc_surface.coeffs['y0']
+        y0 = openmc_surface.y0
         opencg_surface = opencg.YPlane(surface_id, name, boundary, y0)
 
     elif openmc_surface.type == 'z-plane':
-        z0 = openmc_surface.coeffs['z0']
+        z0 = openmc_surface.z0
         opencg_surface = opencg.ZPlane(surface_id, name, boundary, z0)
 
     elif openmc_surface.type == 'x-cylinder':
-        y0 = openmc_surface.coeffs['y0']
-        z0 = openmc_surface.coeffs['z0']
-        R = openmc_surface.coeffs['R']
+        y0 = openmc_surface.y0
+        z0 = openmc_surface.z0
+        R = openmc_surface.r
         opencg_surface = opencg.XCylinder(surface_id, name,
                                             boundary, y0, z0, R)
 
     elif openmc_surface.type == 'y-cylinder':
-        x0 = openmc_surface.coeffs['x0']
-        z0 = openmc_surface.coeffs['z0']
-        R = openmc_surface.coeffs['R']
+        x0 = openmc_surface.x0
+        z0 = openmc_surface.z0
+        R = openmc_surface.r
         opencg_surface = opencg.YCylinder(surface_id, name,
                                             boundary, x0, z0, R)
 
     elif openmc_surface.type == 'z-cylinder':
-        x0 = openmc_surface.coeffs['x0']
-        y0 = openmc_surface.coeffs['y0']
-        R = openmc_surface.coeffs['R']
+        x0 = openmc_surface.x0
+        y0 = openmc_surface.y0
+        R = openmc_surface.r
         opencg_surface = opencg.ZCylinder(surface_id, name,
                                             boundary, x0, y0, R)
 
@@ -297,40 +297,40 @@ def get_openmc_surface(opencg_surface):
         boundary = 'transmission'
 
     if opencg_surface.type == 'plane':
-        A = opencg_surface.coeffs['A']
-        B = opencg_surface.coeffs['B']
-        C = opencg_surface.coeffs['C']
-        D = opencg_surface.coeffs['D']
+        A = opencg_surface.a
+        B = opencg_surface.b
+        C = opencg_surface.c
+        D = opencg_surface.d
         openmc_surface = openmc.Plane(surface_id, boundary, A, B, C, D, name)
 
     elif opencg_surface.type == 'x-plane':
-        x0 = opencg_surface.coeffs['x0']
+        x0 = opencg_surface.x0
         openmc_surface = openmc.XPlane(surface_id, boundary, x0, name)
 
     elif opencg_surface.type == 'y-plane':
-        y0 = opencg_surface.coeffs['y0']
+        y0 = opencg_surface.y0
         openmc_surface = openmc.YPlane(surface_id, boundary, y0, name)
 
     elif opencg_surface.type == 'z-plane':
-        z0 = opencg_surface.coeffs['z0']
+        z0 = opencg_surface.z0
         openmc_surface = openmc.ZPlane(surface_id, boundary, z0, name)
 
     elif opencg_surface.type == 'x-cylinder':
-        y0 = opencg_surface.coeffs['y0']
-        z0 = opencg_surface.coeffs['z0']
-        R = opencg_surface.coeffs['R']
+        y0 = opencg_surface.y0
+        z0 = opencg_surface.z0
+        R = opencg_surface.r
         openmc_surface = openmc.XCylinder(surface_id, boundary, y0, z0, R, name)
 
     elif opencg_surface.type == 'y-cylinder':
-        x0 = opencg_surface.coeffs['x0']
-        z0 = opencg_surface.coeffs['z0']
-        R = opencg_surface.coeffs['R']
+        x0 = opencg_surface.x0
+        z0 = opencg_surface.z0
+        R = opencg_surface.r
         openmc_surface = openmc.YCylinder(surface_id, boundary, x0, z0, R, name)
 
     elif opencg_surface.type == 'z-cylinder':
-        x0 = opencg_surface.coeffs['x0']
-        y0 = opencg_surface.coeffs['y0']
-        R = opencg_surface.coeffs['R']
+        x0 = opencg_surface.x0
+        y0 = opencg_surface.y0
+        R = opencg_surface.r
         openmc_surface = openmc.ZCylinder(surface_id, boundary, x0, y0, R, name)
 
     else:
@@ -384,9 +384,9 @@ def get_compatible_opencg_surfaces(opencg_surface):
     boundary = opencg_surface.boundary_type
 
     if opencg_surface.type == 'x-squareprism':
-        y0 = opencg_surface.coeffs['y0']
-        z0 = opencg_surface.coeffs['z0']
-        R = opencg_surface.coeffs['R']
+        y0 = opencg_surface.y0
+        z0 = opencg_surface.z0
+        R = opencg_surface.r
 
         # Create a list of the four planes we need
         left = opencg.YPlane(name=name, boundary=boundary, y0=y0-R)
@@ -396,9 +396,9 @@ def get_compatible_opencg_surfaces(opencg_surface):
         surfaces = [left, right, bottom, top]
 
     elif opencg_surface.type == 'y-squareprism':
-        x0 = opencg_surface.coeffs['x0']
-        z0 = opencg_surface.coeffs['z0']
-        R = opencg_surface.coeffs['R']
+        x0 = opencg_surface.x0
+        z0 = opencg_surface.z0
+        R = opencg_surface.r
 
         # Create a list of the four planes we need
         left = opencg.XPlane(name=name, boundary=boundary, x0=x0-R)
@@ -408,9 +408,9 @@ def get_compatible_opencg_surfaces(opencg_surface):
         surfaces = [left, right, bottom, top]
 
     elif opencg_surface.type == 'z-squareprism':
-        x0 = opencg_surface.coeffs['x0']
-        y0 = opencg_surface.coeffs['y0']
-        R = opencg_surface.coeffs['R']
+        x0 = opencg_surface.x0['x0']
+        y0 = opencg_surface.y0['y0']
+        R = opencg_surface.r['R']
 
         # Create a list of the four planes we need
         left = opencg.XPlane(name=name, boundary=boundary, x0=x0-R)

From 02d6b99d782d2e125bed15235ffe0870ef9cf9b8 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 3 Oct 2015 14:30:53 -0400
Subject: [PATCH 5/7] Removed accidental commit of Python API generated xml
 files

---
 docs/source/pythonapi/examples/geometry.xml   |  38 ------------------
 .../pythonapi/examples/materials-xy.png       | Bin 1271 -> 0 bytes
 docs/source/pythonapi/examples/materials.xml  |  20 ---------
 docs/source/pythonapi/examples/plots.xml      |   8 ----
 docs/source/pythonapi/examples/settings.xml   |  21 ----------
 docs/source/pythonapi/examples/tallies.xml    |  23 -----------
 .../tracks/128_angles_0.1_cm_spacing.data     | Bin 108911 -> 0 bytes
 7 files changed, 110 deletions(-)
 delete mode 100644 docs/source/pythonapi/examples/geometry.xml
 delete mode 100644 docs/source/pythonapi/examples/materials-xy.png
 delete mode 100644 docs/source/pythonapi/examples/materials.xml
 delete mode 100644 docs/source/pythonapi/examples/plots.xml
 delete mode 100644 docs/source/pythonapi/examples/settings.xml
 delete mode 100644 docs/source/pythonapi/examples/tallies.xml
 delete mode 100644 docs/source/pythonapi/examples/tracks/128_angles_0.1_cm_spacing.data

diff --git a/docs/source/pythonapi/examples/geometry.xml b/docs/source/pythonapi/examples/geometry.xml
deleted file mode 100644
index 8e9f1ef3d1..0000000000
--- a/docs/source/pythonapi/examples/geometry.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<geometry>
-    <cell id="10000" material="10000" name="1.6% Fuel" surfaces="-10000" universe="10000" />
-    <cell id="10001" material="10002" name="1.6% Clad" surfaces="10000 -10001" universe="10000" />
-    <cell id="10002" material="10001" name="1.6% Moderator" surfaces="10001" universe="10000" />
-    <cell fill="10001" id="10003" name="root cell" surfaces="10002 -10003 10004 -10005 10006 -10007" universe="0" />
-    <lattice id="10001" name="1.6% Fuel - 0BA">
-        <pitch>1.26 1.26</pitch>
-        <dimension>17 17</dimension>
-        <lower_left>-10.71 -10.71</lower_left>
-        <universes>
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 
-10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 10000 </universes>
-    </lattice>
-    <surface boundary="transmission" coeffs="0.0 0.0 0.39218" id="10000" type="z-cylinder" />
-    <surface boundary="transmission" coeffs="0.0 0.0 0.4572" id="10001" type="z-cylinder" />
-    <surface boundary="reflective" coeffs="-10.71" id="10002" type="x-plane" />
-    <surface boundary="vacuum" coeffs="10.71" id="10003" type="x-plane" />
-    <surface boundary="vacuum" coeffs="-10.71" id="10004" type="y-plane" />
-    <surface boundary="reflective" coeffs="10.71" id="10005" type="y-plane" />
-    <surface boundary="reflective" coeffs="-10.71" id="10006" type="z-plane" />
-    <surface boundary="reflective" coeffs="10.71" id="10007" type="z-plane" />
-</geometry>
diff --git a/docs/source/pythonapi/examples/materials-xy.png b/docs/source/pythonapi/examples/materials-xy.png
deleted file mode 100644
index 534f7e5ff7251fbc6984a811cb22d37ea2df8c4e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1271
zcmZ{kZB&wH7{_ljJ7-pN={b=rqgImUR4U5_0<%G2Qy`;BX__zP>(rBUL`@$h)2v)(
zSr(d2%W9rv%#}qY&6l*Y$jq?WFlFTn3L2<@JkLE^pY~xNuIqRI&$<5p>(hM|aoNm;
z_Fviq02T(Y=)qQ+Kh_*uYo8MRR&T}JSpOh@0Hi19TO#eO+9oZSxdqfeTQ*`9E23G!
zK>%bD0Lab%WX>H1;2;rz(Y*kW$^pQoR>-#dS!Wk;19=Px;Q>d-k=#>3^43xR{MnCz
zQQtG^;HaGo%PKxgW$j9{^5dHYwmwRv0$}?(fbP$WQ;mzs$!g*k1=&SocU~+gF18PG
z-{d98uMjc0k-pkSeq}S0d&)K`()QLC%GXraZRU9H=SeFb6s|b@pkiR+G^_rHw?jut
z6dudrtySi?t<!W$`J(YGZtK;MsCPJ5*EMzyDBsO(P+z*{-I3tQEGG`(ETO4BrziD_
z;zMgv=T1vXv`a*iOwOAae#mRdGgkX{oS+e!kWqS5yjr6>^H_2<awW4Z@2Rn&j}@}n
z`Q(&Qo}{2>_@{)Ng59fQG6;jtxVF{XCLOvKrc*nUmt4Z|l$=?HpyMd2e!23XuuQ0(
zxY4o}2C<#at8N@SA1D*uV=VIaC?2a$8({d?VU-=e*}`@cnTolIpLHdW2+1+<^_%xq
zlpG(QI7dzbCNr$wlbM-X_g*q;$lAUf5!dz)GHD0wa9k)=?;^}Qd|}$hxo)aqysF21
zedQBz*@uG0+UwO_@{M8XtfE)H-^9lGG%Cu!rdcD)DGCT-@1ZHRCh|L&K52_hjFirM
ziVuHNyWTMrd3=TD-g}``RM?Q$V|kjeqvq8kL5#h2+3j4D6IoTFLiwFMNHJYjHv3h;
z<*{a6wo;LSX%b!i?m_nHa2F3)%1(^hAC*u&DAxt2w5#X5=ZqN>go)i{SY7p*@TF-I
zm=G{y@)n=qz#fZ|H*h>Ja9Tcr-93lZsSA_Li@h#k(e28wo?PkP%@@zRBb|)s7PPBN
zpzN~73k&Tu^b4ez#)Q?v`dE{<JLVCj6dQsWjZo`nG(@=Olo~F$4LTIS-Q`PP)K%BO
z(6wPQ%Q*^~{s5t1i&RL1&4^3$FF6@Ij_C%O?fsid^X8Y+r0SiJax=4!JRITqCq^bi
z7P?3Dl174a%-%C*$!laUbcvHC`<Nx}_gBrrZlupBeKFAb7SrsIhQmq?Vq?({pg3pb
z8yJVSU9{$PVTIEXzrq@gqGr~66z^}rO-g#F@RW<bMz-F9&&GiMBo#rwg_Q<NF%`Dx
z@Xu%PT|=C|g$8t~8FM%UjZPNaA-Lc^+}ba1!H#Qbt^ekt-U8@(4YK=@u*cZQ8#F=y
zomFt_On<Zz852H~>hZ&-(^*DczTTGu+nynR3@M)LQ=~(jF`>b-&;BButEeKO>CGmk
zol(*lA9#=E)Pb~D$_o@o&5$BmQPn#+j27l%p|X<mSXPEv(uc(UMHA_0KhH>_KCPHV
zhS8Q~cj1y=Bvw^bG%7z-3kd@j+->B93i*kQG}$0wW%%3F#a-6l?kZsL1u>C=eWd6E
z`>X)#iR(6ct|NL9H}KYNAQ3l^Hg5JL`jCjk^;$3VKZYMuV&eB_{J-J5hO^cS20#FV
KO|RdwSM(2?bdD_m

diff --git a/docs/source/pythonapi/examples/materials.xml b/docs/source/pythonapi/examples/materials.xml
deleted file mode 100644
index 42c2e50292..0000000000
--- a/docs/source/pythonapi/examples/materials.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<materials>
-    <default_xs>71c</default_xs>
-    <material id="10000" name="1.6% Fuel">
-        <density units="g/cm3" value="10.31341" />
-        <nuclide ao="0.022625" name="U-238" />
-        <nuclide ao="0.046007" name="O-16" />
-        <nuclide ao="0.00037503" name="U-235" />
-    </material>
-    <material id="10001" name="Borated Water">
-        <density units="g/cm3" value="0.740582" />
-        <nuclide ao="0.024732" name="O-16" />
-        <nuclide ao="8.0042e-06" name="B-10" />
-        <nuclide ao="0.049457" name="H-1" />
-    </material>
-    <material id="10002" name="Zircaloy">
-        <density units="g/cm3" value="6.55" />
-        <nuclide ao="0.0072758" name="Zr-90" />
-    </material>
-</materials>
diff --git a/docs/source/pythonapi/examples/plots.xml b/docs/source/pythonapi/examples/plots.xml
deleted file mode 100644
index 512070a33f..0000000000
--- a/docs/source/pythonapi/examples/plots.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<plots>
-    <plot basis="xy" color="mat" filename="materials-xy" id="1" type="slice">
-        <origin>0 0 0</origin>
-        <width>21.5 21.5</width>
-        <pixels>250 250</pixels>
-    </plot>
-</plots>
diff --git a/docs/source/pythonapi/examples/settings.xml b/docs/source/pythonapi/examples/settings.xml
deleted file mode 100644
index 26a23e9421..0000000000
--- a/docs/source/pythonapi/examples/settings.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<settings>
-    <eigenvalue>
-        <particles>2500</particles>
-        <batches>20</batches>
-        <inactive>5</inactive>
-    </eigenvalue>
-    <source>
-        <space type="box">
-            <parameters>-10.71 -10.71 -10 10.71 10.71 10.0</parameters>
-        </space>
-    </source>
-    <output>
-        <tallies>false</tallies>
-        <summary>true</summary>
-    </output>
-    <trigger>
-        <active>true</active>
-        <max_batches>200</max_batches>
-    </trigger>
-</settings>
diff --git a/docs/source/pythonapi/examples/tallies.xml b/docs/source/pythonapi/examples/tallies.xml
deleted file mode 100644
index 61873a91d7..0000000000
--- a/docs/source/pythonapi/examples/tallies.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<tallies>
-    <mesh id="1" type="regular">
-        <dimension>17 17</dimension>
-        <lower_left>-10.71 -10.71</lower_left>
-        <width>1.26 1.26</width>
-    </mesh>
-    <tally id="10000" name="mesh tally">
-        <filter bins="1" type="mesh" />
-        <filter bins="0.0 6.25e-07 20.0" type="energy" />
-        <scores>fission nu-fission</scores>
-    </tally>
-    <tally id="10001" name="cell tally">
-        <filter bins="10000" type="cell" />
-        <nuclides>U-235 U-238</nuclides>
-        <scores>scatter-y2</scores>
-    </tally>
-    <tally id="10002" name="distribcell tally">
-        <filter bins="10002" type="distribcell" />
-        <scores>absorption scatter</scores>
-        <trigger scores="absorption" threshold="5e-05" type="std_dev" />
-    </tally>
-</tallies>
diff --git a/docs/source/pythonapi/examples/tracks/128_angles_0.1_cm_spacing.data b/docs/source/pythonapi/examples/tracks/128_angles_0.1_cm_spacing.data
deleted file mode 100644
index bbe6462a6c3b6855689590a0aaa161a18abec43c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108911
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


From d193a1eb0b44c5430ea709a9133e69e3d6fa40c1 Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 3 Oct 2015 14:33:28 -0400
Subject: [PATCH 6/7] Removed Cel.fill property in place of Cell.fill_type

---
 openmc/universe.py | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/openmc/universe.py b/openmc/universe.py
index 9516192802..ef89780e1f 100644
--- a/openmc/universe.py
+++ b/openmc/universe.py
@@ -85,8 +85,15 @@ class Cell(object):
         return self._fill
 
     @property
-    def type(self):
-        return self._fill
+    def fill_type(self):
+        if isinstance(self.fill, openmc.Material):
+            return 'material'
+        elif isinstance(self.fill, openmc.Universe):
+            return 'universe'
+        elif isinstance(self.fill, openmc.Lattice):
+            return 'lattice'
+        else:
+            return None
 
     @property
     def surfaces(self):

From e7cba5b22c39834869290e1c88da8c0e085485be Mon Sep 17 00:00:00 2001
From: Will Boyd <wbinventor@gmail.com>
Date: Sat, 3 Oct 2015 14:54:46 -0400
Subject: [PATCH 7/7] Fixed minor issues with OpenCG surface coefficient
 properties in compatibility module

---
 openmc/opencg_compatible.py | 2 +-
 openmc/surface.py           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/openmc/opencg_compatible.py b/openmc/opencg_compatible.py
index a6f90818f9..1cdf8e8756 100644
--- a/openmc/opencg_compatible.py
+++ b/openmc/opencg_compatible.py
@@ -220,7 +220,7 @@ def get_opencg_surface(openmc_surface):
         opencg_surface = opencg.Plane(surface_id, name, boundary, A, B, C, D)
 
     elif openmc_surface.type == 'x-plane':
-        x0 = openmc_surface.y0
+        x0 = openmc_surface.x0
         opencg_surface = opencg.XPlane(surface_id, name, boundary, x0)
 
     elif openmc_surface.type == 'y-plane':
diff --git a/openmc/surface.py b/openmc/surface.py
index 164bbd09bf..063787ce34 100644
--- a/openmc/surface.py
+++ b/openmc/surface.py
@@ -275,7 +275,7 @@ class XPlane(Plane):
 
     @property
     def x0(self):
-        return self.coeff['x0']
+        return self.coeffs['x0']
 
     @x0.setter
     def x0(self, x0):