Add key word arguments to QuadTEAPOT

Author: austin-hoover

examples/TEAPOT/test_nodes.py

@@ -49,15 +49,41 @@ def test_multipole():
     skews = [0, 1, 0]
     node = teapot.MultipoleTEAPOT(
         name=name,
+        length=length,
+        nparts=nparts,
         poles=poles,
         kls=kls,
         skews=skews,
-        nparts=nparts,
+    )
+    assert node.getName() == name
+    assert node.getLength() == length
+    assert node.getnParts() == nparts
+    assert node.getParam("kls") == kls
+    assert node.getParam("skews") == skews
+    assert node.getParam("poles") == poles
+
+
+def test_quad():
+    name = "name"
+    kq = 0.5
+    nparts = 10
+    length = 1.0
+    poles = [1, 2, 3]
+    kls = [0.0, 1.0, 2.0]
+    skews = [0, 1, 0]
+    node = teapot.QuadTEAPOT(
+        name=name,
+        kq=kq,
         length=length,
+        nparts=nparts,
+        poles=poles,
+        kls=kls,
+        skews=skews,
     )
     assert node.getName() == name
     assert node.getLength() == length
     assert node.getnParts() == nparts
+    assert node.getParam("kq") == kq
     assert node.getParam("kls") == kls
     assert node.getParam("skews") == skews
     assert node.getParam("poles") == poles

py/orbit/teapot/teapot.py

@@ -716,11 +716,11 @@ class MultipoleTEAPOT(NodeTEAPOT):
     def __init__(
         self,
         name: str = "multipole no name",
+        length: float = 0.0,
+        nparts: int = 2,
         poles: list[int] = None,
         kls: list[float] = None,
         skews: list[int] = None,
-        nparts: int = 2,
-        length: float = 0.0,
     ) -> None:
         """
         Constructor. Creates the Multipole
@@ -861,18 +861,27 @@ class QuadTEAPOT(NodeTEAPOT):
     Quad Combined Function TEAPOT element.
     """
 
-    def __init__(self, name: str = "quad no name") -> None:
+    def __init__(
+        self,
+        name: str = "quad no name",
+        length: float = 0.0,
+        nparts: int = 2,
+        kq: float = 0.0,
+        poles: list[int] = None,
+        kls: list[float] = None,
+        skews: list[int] = None,
+    ) -> None:
         """
         Constructor. Creates the Quad
         Combined Function TEAPOT element.
         """
         NodeTEAPOT.__init__(self, name)
-
-        self.addParam("kq", 0.0)
-        self.addParam("poles", [])
-        self.addParam("kls", [])
-        self.addParam("skews", [])
-        self.setnParts(2)
+        self.addParam("kq", kq)
+        self.addParam("poles", poles if poles else [])
+        self.addParam("kls", kls if kls else [])
+        self.addParam("skews", skews if skews else [])
+        self.setnParts(nparts)
+        self.setLength(length)
         self.waveform = None
 
         def fringeIN(node, paramsDict):