atcollab · oscarxblanco · Aug 6, 2026 · Aug 6, 2026 · Aug 6, 2026 · Aug 6, 2026
diff --git a/pyat/at/physics/rdt.py b/pyat/at/physics/rdt.py
@@ -102,8 +102,14 @@ def pf(i, j):
         betaym = betay[mask_b2l]
         pxm = px[mask_b2l]
         pym = py[mask_b2l]
+        rbetaxm = rbetax[mask_b2l]
+        etaxm = etax[mask_b2l]
         rdts["h20000"] = 1 / 8 * pf(2, 0) * sum(b2lm * betaxm * pxm * pxm)
         rdts["h00200"] = -1 / 8 * pf(0, 2) * sum(b2lm * betaym * pym * pym)
+        rdts["h11000"] = 1 / 4 * nperiods * sum(b2lm * betaxm)
+        rdts["h00110"] = -1 / 4 * nperiods * sum(b2lm * betaym)
+        rdts["h10001"] = 1 / 2 * pf(1, 0) * sum(b2lm * rbetaxm * etaxm * pxm)
+        rdts["h00002"] = 1 / 2 * nperiods * sum(b2lm * etaxm * etaxm)
 
     if (RDTType.COUPLING in rdttype) or (RDTType.ALL in rdttype):
         a2lm = a2l[mask_a2l]
@@ -135,10 +141,11 @@ def pf(i, j):
             1 / 2 * pf(0, 2)
             * sum((b2lm * betaym / 4 - b3lm * betaym * etaxm / 2) * pym * pym)
         )
-        rdts["h10002"] = 1 / 2 * pf(1, 0 ) * sum(
-            (b3lm * rbetaxm * etaxm * etaxm - b2lm * rbetaxm * etaxm)
-            * pxm
+        rdts["h10002"] = (
+            1 / 2 * pf(1, 0)
+            * sum((b3lm * rbetaxm * etaxm * etaxm - b2lm * rbetaxm * etaxm) * pxm)
         )
+        rdts["h00003"] = 1 / 6 * nperiods * sum((2 * b3lm * etaxm - 3 * b2lm) * etaxm * etaxm)
         # fmt: on
 
     if (RDTType.GEOMETRIC1 in rdttype) or (RDTType.ALL in rdttype):
@@ -198,35 +205,62 @@ def pf(i, j):
         )
 
     if (RDTType.CHROMATIC2 in rdttype) or (RDTType.ALL in rdttype):
-        b4lm = b4l[mask_b4l]
-        betaxm = betax[mask_b4l]
-        betaym = betay[mask_b4l]
-        etaxm = etax[mask_b4l]
-        pxm = px[mask_b4l]
-        pym = py[mask_b4l]
+        mask_b234l = mask_b2l | mask_b3l | mask_b4l
+        b4lm = b4l[mask_b234l]
+        b3lm = b3l[mask_b234l]
+        b2lm = b2l[mask_b234l]
+        betaxm = betax[mask_b234l]
+        betaym = betay[mask_b234l]
+        etaxm = etax[mask_b234l]
+        pxm = px[mask_b234l]
+        pym = py[mask_b234l]
         rbetaxm = np.sqrt(betaxm)
         etaxm2 = etaxm * etaxm
         cpym = np.conj(pym)
-        rdts["h21001"] = 3 / 8 * pf(1, 0) * sum(b4lm * etaxm * rbetaxm * betaxm * pxm)
-        rdts["h30001"] = (
-            1 / 8 * pf(3, 0) * sum(b4lm * etaxm * rbetaxm * betaxm * pxm * pxm * pxm)
+        rdts["h21001"] = (
+            1 / 8 * pf(1, 0) * sum((3 * b4lm * etaxm - b3lm) * rbetaxm * betaxm * pxm)
         )
         # fmt: off
+        rdts["h30001"] = (
+            1 / 24 * pf(3, 0)
+            * sum((3 * b4lm * etaxm - b3lm) * rbetaxm * betaxm * pxm * pxm * pxm)
+        )
         rdts["h10021"] = (
-            -3 / 8 * pf(1, -2)
-            * sum(b4lm * etaxm * rbetaxm * betaym * pxm * cpym * cpym)
+            -1 / 8 * pf(1, -2)
+            * sum((3 * b4lm * etaxm - b3lm) * rbetaxm * betaym * pxm * cpym * cpym)
+        )
+        rdts["h10111"] = (
+            -1 / 4 * pf(1, 0) * sum((3 * b4lm * etaxm - b3lm) * rbetaxm * betaym * pxm)
         )
-        # fmt: on
-        rdts["h10111"] = -3 / 4 * pf(1, 0) * sum(b4lm * etaxm * rbetaxm * betaym * pxm)
         rdts["h10201"] = (
-            -3 / 8 * pf(1, 2) * sum(b4lm * etaxm * rbetaxm * betaym * pxm * pym * pym)
+            -1 / 8 * pf(1, 2)
+            * sum((3 * b4lm * etaxm - b3lm) * rbetaxm * betaym * pxm * pym * pym)
+        )
+        rdts["h11002"] = (
+            1 / 4 * nperiods
+            * sum((3 * b4lm * etaxm2 - 2 * b3lm * etaxm + b2lm) * betaxm)
+        )
+        rdts["h20002"] = (
+            1 / 8 * pf(2, 0)
+            * sum((3 * b4lm * etaxm2 - 2 * b3lm * etaxm + b2lm) * betaxm * pxm * pxm)
+        )
+        rdts["h00112"] = (
+            -1 / 4 * nperiods
+            * sum((3 * b4lm * etaxm2 - 2 * b3lm * etaxm + b2lm) * betaym)
+        )
+        rdts["h00202"] = (
+            -1 / 8 * pf(0, 2)
+            * sum((3 * b4lm * etaxm2 - 2 * b3lm * etaxm + b2lm) * betaym * pym * pym)
+        )
+        rdts["h10003"] = (
+            1 / 2 * pf(1, 0)
+            * sum((b4lm * etaxm2 - b3lm * etaxm + b2lm) * rbetaxm * etaxm * pxm)
+        )
+        rdts["h00004"] = (
+            1 / 24 * nperiods
+            * sum((6 * b4lm * etaxm2 - 8 * b3lm * etaxm + 12 * b2lm) * etaxm2)
         )
-        rdts["h11002"] = 3 / 4 * nperiods * sum(b4lm * etaxm2 * betaxm)
-        rdts["h20002"] = 3 / 8 * pf(2, 0) * sum(b4lm * etaxm2 * betaxm * pxm * pxm)
-        rdts["h00112"] = -3 / 4 * nperiods * sum(b4lm * etaxm2 * betaym)
-        rdts["h00202"] = -3 / 8 * pf(0, 2) * sum(b4lm * etaxm2 * betaym * pym * pym)
-        rdts["h10003"] = 1 / 2 * pf(1, 0) * sum(b4lm * etaxm2 * etaxm * rbetaxm * pxm)
-        rdts["h00004"] = 1 / 4 * nperiods * sum(b4lm * etaxm2 * etaxm2)
+        # fmpt: on
 
     if (RDTType.GEOMETRIC3 in rdttype) or (RDTType.ALL in rdttype):
         b5lm = b5l[mask_b5l]
@@ -680,13 +714,13 @@ def get_rdts(
     **rdts** is a :py:class:`record array <numpy.recarray>` with fields:
 
     for :py:obj:`~RDTType.FOCUSING`:
-        `h20000`, `h00200`
+        `h20000`, `h00200`, `h11000`, `h00110`, `h00002`
 
     for :py:obj:`~RDTType.COUPLING`:
         `h10010`, `h10100`
 
     for :py:obj:`~RDTType.CHROMATIC`:
-        `h11001`, `h00111`, `h20001`, `h00201`, `h10002`
+        `h11001`, `h00111`, `h20001`, `h00201`, `h10002`, `h00003`
 
     for :py:obj:`~RDTType.GEOMETRIC1`:
         `h21000`, `h30000`, `h10110`, `h10020`, `h10200`

diff --git a/pyat/test/test_physics.py b/pyat/test/test_physics.py
@@ -585,13 +585,18 @@ def test_rdt(hmba_lattice):
         "refpts": [5],
         "h20000": [-2.95967705 - 1.77129145j],
         "h00200": [1.91618925 + 1.03505564j],
+        "h11000": [342.6894347 + 0.0j],
+        "h00110": [257.16817596 + 0.0j],
+        "h10001": [0.00644487 + 0.00176723j],
+        "h00002": [0.24292177 + 0.0j],
         "h10010": [0.0 + 0.0j],
         "h10100": [0.0 + 0.0j],
         "h11001": [18.80466492 + 0.0j],
         "h00111": [13.52540184 + 0.0j],
         "h20001": [-4.13510682 - 2.41357511j],
         "h00201": [1.71499168 + 0.93163935j],
         "h10002": [-0.00846011 - 0.00231724j],
+        "h00003": [-0.07697747 + 0.0j],
         "h21000": [-0.82318652 - 0.22468352j],
         "h30000": [-1.93582223 - 1.99073744j],
         "h10110": [5.86104821 + 1.60003465j],
@@ -611,17 +616,17 @@ def test_rdt(hmba_lattice):
         "h20200": [-210.39145057 - 349.80230878j],
         "h00310": [-578.20990151 - 313.16651706j],
         "h00400": [-68.59147195 - 105.14365305j],
-        "h21001": [7.67441163 + 2.09471862j],
-        "h30001": [17.54984324 + 18.0477455j],
-        "h10021": [40.21318804 - 9.41188329j],
-        "h10111": [-10.38109186 - 2.83315514j],
-        "h10201": [44.75048054 + 42.77549618j],
-        "h11002": [-370.02209659 + 0.0j],
-        "h20002": [7.0782955 + 4.17514102j],
-        "h00112": [250.26027312 + 0.0j],
-        "h00202": [3.50518531 + 1.89845499j],
-        "h10003": [0.00699234 + 0.00190852j],
-        "h00004": [-0.08428393 + 0.0j],
+        "h21001": [8.49759816 + 2.31940215j],
+        "h30001": [19.48566545 + 20.03848294j],
+        "h10021": [32.25603524 - 7.54967556j],
+        "h10111": [-16.24214009 - 4.43318979j],
+        "h10201": [47.9919823 + 45.87430765j],
+        "h11002": [-388.82676151 + 0.0j],
+        "h20002": [11.21340231 + 6.58871615j],
+        "h00112": [236.73487128 + 0.0j],
+        "h00202": [1.79019363 + 0.96681565j],
+        "h10003": [0.01545246 + 0.00422576j],
+        "h00004": [-0.00730645 + 0.0j],
         "h10400": [0.0 + 0.0j],
         "h10040": [0.0 + 0.0j],
         "h10310": [0.0 + 0.0j],