From 3087e19ef4a1017691e38e5081eff8ad8260c2e5 Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Mon, 12 Aug 2013 16:25:56 -0400 Subject: [PATCH] updated score_scatter_pn for 2 tally results --- tests/test_score_scatter_pn/results.py | 19 +++++++++++++------ tests/test_score_scatter_pn/results_true.dat | 13 ++++++++++++- 2 files changed, 25 insertions(+), 7 deletions(-) diff --git a/tests/test_score_scatter_pn/results.py b/tests/test_score_scatter_pn/results.py index f2f03137bf..d6ab485d95 100644 --- a/tests/test_score_scatter_pn/results.py +++ b/tests/test_score_scatter_pn/results.py @@ -12,10 +12,14 @@ sp = statepoint.StatePoint('statepoint.10.binary') sp.read_results() # extract tally results and convert to vector -results = sp.tallies[0].results -shape = results.shape -size = (np.product(shape)) -results = np.reshape(results, size) +results1 = sp.tallies[0].results +shape1 = results1.shape +size1 = (np.product(shape1)) +results1 = np.reshape(results1, size1) +results2 = sp.tallies[1].results +shape2 = results2.shape +size2 = (np.product(shape2)) +results2 = np.reshape(results2, size2) # set up output string outstr = '' @@ -25,8 +29,11 @@ outstr += 'k-combined:\n' outstr += "{0:10.8f} {1:10.8f}\n".format(sp.k_combined[0], sp.k_combined[1]) # write out tally results -outstr += 'tallies:\n' -for item in results: +outstr += 'tally 1:\n' +for item in results1: + outstr += "{0:10.8f}\n".format(item) +outstr += 'tally 2:\n' +for item in results2: outstr += "{0:10.8f}\n".format(item) # write results to file diff --git a/tests/test_score_scatter_pn/results_true.dat b/tests/test_score_scatter_pn/results_true.dat index fc7995f78a..5def562f07 100644 --- a/tests/test_score_scatter_pn/results_true.dat +++ b/tests/test_score_scatter_pn/results_true.dat @@ -1,6 +1,17 @@ k-combined: 1.63626998 0.13749537 -tallies: +tally 1: +12.52000000 +31.63760000 +0.98756223 +0.21542730 +0.45047247 +0.04228472 +0.31795301 +0.03892891 +0.05365941 +0.01062510 +tally 2: 12.52000000 31.63760000 0.98756223