From d8b71b61259c4e00579607712acebed7812e40ce Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Sat, 1 Jul 2023 19:44:39 +0100 Subject: [PATCH 1/2] int(Series[0]) deprecation warning --- src/pyg4ometry/convert/fluka2g4materials.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pyg4ometry/convert/fluka2g4materials.py b/src/pyg4ometry/convert/fluka2g4materials.py index 47ffc6e9b..e1e37e14b 100644 --- a/src/pyg4ometry/convert/fluka2g4materials.py +++ b/src/pyg4ometry/convert/fluka2g4materials.py @@ -260,7 +260,7 @@ def atomicMassFromZ(self, z): 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 From b6c973c6941faa3d974290b94403af0f0829a116 Mon Sep 17 00:00:00 2001 From: Stewart Boogert Date: Sat, 1 Jul 2023 19:48:49 +0100 Subject: [PATCH 2/2] float(Series[0]) deprecation warning --- src/pyg4ometry/convert/fluka2g4materials.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pyg4ometry/convert/fluka2g4materials.py b/src/pyg4ometry/convert/fluka2g4materials.py index e1e37e14b..b58bfccfc 100644 --- a/src/pyg4ometry/convert/fluka2g4materials.py +++ b/src/pyg4ometry/convert/fluka2g4materials.py @@ -255,7 +255,7 @@ 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