Merge remote-tracking branch 'upstream/develop' into new-scatt-mat

tests/test_asymmetric_lattice/results_true.dat

@@ -1 +1 @@
-3a43588f986f577151b488f64d8e7ef8e568bf9b3df923d2b8267d662d176360c99c4f3788d95676861fdb0f2ef8eb7569db37b8c6f0a849de05ae96a5844e5b
+f388c07481a7333bde8044d2e8805954ec41cc3e73d00f1b92b6acff03dad06e62a74e8b7595994e877f69a051ff34d8e498de69ac0efec6e396434007c10b0c

tests/test_asymmetric_lattice/test_asymmetric_lattice.py

@@ -90,14 +90,10 @@ class AsymmetricLatticeTestHarness(PyAPITestHarness):
 
         # Extract fuel assembly lattices from the summary
         cells = sp.summary.geometry.get_all_cells()
-        core = cells[1]
-        fuel = cells[80]
-        fuel = fuel.fill
-        core = core.fill
+        fuel_cell = cells[27]
 
         # Append a string of lattice distribcell offsets to the string
-        outstr += ', '.join(map(str, fuel.offsets.flatten())) + '\n'
-        outstr += ', '.join(map(str, core.offsets.flatten())) + '\n'
+        outstr += '\n'.join(fuel_cell.paths) + '\n'
 
         # Hash the results if necessary
         if hash_output:

tests/test_distribmat/results_true.dat

@@ -7,5 +7,3 @@ Cell
 	Region         =	-10000
 	Rotation       =	None
 	Translation    =	None
-	Offset         =	None
-	Distribcell index=	1

tests/test_multipole/results_true.dat

@@ -8,5 +8,3 @@ Cell
 	Rotation       =	None
 	Temperature    =	[ 500.    0.  700.  800.]
 	Translation    =	None
-	Offset         =	None
-	Distribcell index=	1