Merge branch 'main' into dependabot/github_actions/codecov/codecov-ac…

…tion-5

.readthedocs.yaml

@@ -13,4 +13,4 @@ build:
     python: "3.10"
   jobs:
     post_install:
-      - pip install --upgrade --upgrade-strategy only-if-needed furo sphinx>=7.2.2 sphinx-autoapi sphinx-copybutton sphinx-inline-tabs
+      - pip install --upgrade --upgrade-strategy only-if-needed furo "sphinx>=7.2.2" "sphinx-autoapi<3.4.0" sphinx-copybutton sphinx-inline-tabs

src/pyg4ometry/gdml/Defines.py

@@ -1,5 +1,6 @@
 import numbers as _numbers
 import numpy as _np
+import re as _re
 from . import Units as _Units
 
 
@@ -28,6 +29,10 @@ def __init__(self, name, expressionString, registry):
         self.registry = registry
 
     def eval(self):
+        # short-cut for expressions only having a numeric path
+        if _re.match(r"-?[0-9]+(?:\.[0-9]+)$", self.expressionString):
+            return float(self.expressionString)
+
         expressionParser = self.registry.getExpressionParser()
         self.parseTree = expressionParser.parse(self.expressionString)
         value = expressionParser.evaluate(self.parseTree, self.registry.defineDict)

src/pyg4ometry/visualisation/VtkViewerNew.py

@@ -56,7 +56,6 @@ def clear(self):
         self.clippers = []  # clip filters
         self.axes = []  # axes actors
 
-        self.pdNameDict = {}  # polydata to LV name
         self.instanceNameDict = {}  # instance transformation to PV name
 
         self.bBuiltPipelines = False
@@ -326,7 +325,6 @@ def buildPipelinesAppend(self):
             pd = _Convert.pycsgMeshToVtkPolyData(self.localmeshes[k])
             # pd.SetObjectName(k)
             self.polydata[k] = pd
-            self.pdNameDict[pd] = k
 
         appFltDict = {}
         visOptDict = {}
@@ -708,7 +706,9 @@ def rightButtonPressEvent(self, obj, event):
                 pdmin = pd
                 pdamin = pda
 
-        lvName = self.vtkviewer.pdNameDict[pdamin.GetInputAlgorithm().GetInput()]
+        for name, pd in self.vtkviewer.polydata.items():
+            if pd == pdamin.GetInputAlgorithm().GetInput():
+                lvName = name
         pvName = self.vtkviewer.instanceNameDict[pdamin]
         pvTrans = pdamin.GetTransform()
         [mtra, tra] = _Convert.vtkTransformation2PyG4(pvTrans.GetConcatenatedTransform(0))