solving merging conflicts

paulromano · Nov 12, 2025 · Nov 21, 2024 · Nov 21, 2024 · Nov 21, 2024 · Nov 21, 2024
commit af592d2ba198212fea9930eec4bc14e4666b4ee8
diff --git a/openmc/tallies.py b/openmc/tallies.py
@@ -106,6 +106,10 @@ class Tally(IDManagerMixin):
         Whether the tally will accumulate sum third and sum fourth for each tally bin
     normality_tests = None
         Whether normality tests will be performed on the tally results
+    figure_of_merit : numpy.ndarray
+        An array containing the figure of merit for each bin
+
+        .. versionadded:: 0.15.3
     derived : bool
         Whether or not the tally is derived from one or more other tallies
     sparse : bool
@@ -142,6 +146,7 @@ def __init__(self, tally_id=None, name=''):
         self._std_dev = None
         self._vov = None
         self._normality_tests = None
+        self._simulation_time = None
         self._with_batch_statistics = False
         self._derived = False
         self._sparse = False

diff --git a/tests/unit_tests/test_tallies.py b/tests/unit_tests/test_tallies.py
@@ -1,4 +1,5 @@
 import numpy as np
+import pytest
 import openmc