Merge pull request #41 from stewartboogert/numpy-future

Pandas.Series future
g4edge · Jul 3, 2023 · b7b6cf3 · b7b6cf3
2 parents 2f1f57b + b6c973c
commit b7b6cf3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/pyg4ometry/convert/fluka2g4materials.py b/src/pyg4ometry/convert/fluka2g4materials.py
@@ -255,12 +255,12 @@ def massNumberFromZ(self, z):
     def atomicMassFromZ(self, z):
         t = self.table
         mask = t["AtomicNumber"] == z
-        return float(t["AtomicMass"][mask])
+        return float(t["AtomicMass"][mask].iloc[0])
 
     def atomicNumberAndMassFromSymbol(self, symbol):
         t = self.table
         mask = t["Symbol"] == symbol
-        massNumber = int(t.AtomicMass[mask])
-        atomicNumber = int(t.AtomicNumber[mask])
+        massNumber = int(t.AtomicMass[mask].iloc[0])
+        atomicNumber = int(t.AtomicNumber[mask].iloc[0])
 
         return atomicNumber, massNumber