From 20161c45817a78c8d58d08cdc7954af29e9afb8c Mon Sep 17 00:00:00 2001
From: John Tramm <john.tramm@gmail.com>
Date: Wed, 11 Dec 2019 16:15:33 +0000
Subject: [PATCH] resolved some conflicts when rebasing with develop

---
 examples/xml/pincell/settings.xml | 4 ++--
 src/physics.cpp                   | 2 +-
 src/simulation.cpp                | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/examples/xml/pincell/settings.xml b/examples/xml/pincell/settings.xml
index 7b0a985f1..5845898c8 100644
--- a/examples/xml/pincell/settings.xml
+++ b/examples/xml/pincell/settings.xml
@@ -3,8 +3,8 @@
 
   <!-- Define how many particles to run and for how many batches -->
   <run_mode>eigenvalue</run_mode>
-  <batches>10</batches>
-  <inactive>5</inactive>
+  <batches>100</batches>
+  <inactive>10</inactive>
   <particles>1000</particles>
 
   <!-- The starting source is a uniform distribution over the entire pin
diff --git a/src/physics.cpp b/src/physics.cpp
index 2fbc9dec5..5d72111dc 100644
--- a/src/physics.cpp
+++ b/src/physics.cpp
@@ -184,7 +184,7 @@ create_fission_sites(Particle* p, int i_nuclide, const Reaction* rx,
     site->parent_id = p->id_;
 
     // Sample delayed group and angle/energy for fission reaction
-    sample_fission_neutron(i_nuclide, rx, p->E_, &site, p->current_seed());
+    sample_fission_neutron(i_nuclide, rx, p->E_, site, p->current_seed());
 
     // Set the delayed group on the particle as well
     p->delayed_group_ = site->delayed_group;
diff --git a/src/simulation.cpp b/src/simulation.cpp
index 7e4bf7305..49ffea543 100644
--- a/src/simulation.cpp
+++ b/src/simulation.cpp
@@ -357,7 +357,7 @@ void process_advance_particle_events()
     } else if (p->macro_xs_.total == 0.0) {
       d_collision = INFINITY;
     } else {
-      d_collision = -std::log(prn(p->prn_seeds_ + p->stream_)) / p->macro_xs_.total;
+      d_collision = -std::log(prn(p->current_seed())) / p->macro_xs_.total;
     }
 
     // -------------- break here? -------------------