Clean up CompoundOptic cached properties when inserting/removing items

jmeyers314 · Jan 5, 2024 · 6ed6747 · 6ed6747
1 parent b30d324
commit 6ed6747
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -26,3 +26,4 @@ Bug Fixes
 ---------
 - Allow random seeds in applicable RayVector contructors.
 - Trap divide-by-zero error in field_to_dircos
+- Clean up CompoundOptic cached properties when inserting/removing items
diff --git a/batoid/_version.py b/batoid/_version.py
@@ -1,6 +1,6 @@
 #https://stackoverflow.com/a/7071358/7530778
 
-__version__ = "0.5.1"
+__version__ = "0.5.2"
 tmp = __version__
 if "rc" in tmp:  # pragma: no cover
     tmp = tmp[:tmp.find("rc")]

diff --git a/batoid/optic.py b/batoid/optic.py
@@ -1689,7 +1689,8 @@ def withInsertedOptic(self, before, item):
             raise ValueError("Optic {} not found".format(before))
         newItems = []
         newDict = dict(self.__dict__)
-        del newDict['items']
+        for k in ['items', 'itemDict', '_names', 'R_inner', 'R_outer']:
+            newDict.pop(k, None)
         for i, it in enumerate(self.items):
             if self._names[it.name] == self._names[before]:
                 newItems.append(item)
@@ -1717,7 +1718,8 @@ def withRemovedOptic(self, item):
             raise ValueError("Optic {} not found".format(item))
         newItems = []
         newDict = dict(self.__dict__)
-        del newDict['items']
+        for k in ['items', 'itemDict', '_names', 'R_inner', 'R_outer']:
+            newDict.pop(k, None)
         for it in self.items:
             if self._names[it.name] != self._names[item]:
                 newItems.append(it)