Merge pull request #176 from nikolasibalic/draft_v3.6.0

Draft v3.7.0
nikolasibalic · Dec 26, 2024 · 61c2c8e · 61c2c8e
2 parents f24e89b + 73bb155
commit 61c2c8e
Show file tree

Hide file tree

Showing 5 changed files with 365 additions and 45 deletions.
diff --git a/arc/alkali_atom_data.py b/arc/alkali_atom_data.py
@@ -196,6 +196,15 @@ class Caesium(AlkaliAtom):
         model potential parameters from [#c1]_
 
     """
+
+    alpha_d_eff = 15.79
+
+    alpha_q_eff = 38.7
+
+    """
+        Effective core polarisabilities from https://doi.org/10.1364/JOSA.71.000423
+    """
+
     #
     a1 = [3.49546309, 4.69366096, 4.32466196, 3.01048361]
     """
@@ -238,24 +247,24 @@ class Caesium(AlkaliAtom):
 
     quantumDefect = [
         [
-            [4.04935665, 0.2377037, 0.255401, 0.00378, 0.25486, 0.0],
-            [3.59158950, 0.360926, 0.41905, 0.64388, 1.45035, 0.0],
+            [4.0493532, 0.2391, 0.06, 11, -209, 0.0],
+            [3.5915871, 0.36273, 0.0, 0.0, 0.0, 0.0],
             [2.4754562, 0.009320, -0.43498, -0.76358, -18.0061, 0.0],
             [0.03341424, -0.198674, 0.28953, -0.2601, 0.0, 0.0],
             [0.00703865, -0.049252, 0.01291, 0.0, 0.0, 0.0],
         ],
         [
-            [4.04935665, 0.2377037, 0.255401, 0.00378, 0.25486, 0.0],
-            [3.5589599, 0.392469, -0.67431, 22.3531, -92.289, 0.0],
-            [2.46631524, 0.013577, -0.37457, -2.1867, -1.5532, -56.6739],
+            [4.0493532, 0.2391, 0.06, 11, -209, 0.0],
+            [3.5590676, 0.37469, 0.0, 0.0, 0.0, 0.0],
+            [2.4663144, 0.01381, -0.392, -1.9, 0.0, 0.0],
             [0.03341424, -0.198674, 0.28953, -0.2601, 0.0, 0.0],
             [0.00703865, -0.049252, 0.01291, 0.0, 0.0, 0.0],
         ],
     ]
     """
-        quantum defects for :math:`S_{1/2}`, :math:`nP_{1/2}`, :math:`D_{5/2}`,
+        quantum defects for :math:`S_{1/2}`, :math:`nP_{1/2}`, :math:`nP_{3/2}`, :math:`D_{5/2}` are from https://doi.org/10.1103/PhysRevA.93.013424
         :math:`F_{5/2}` and :math:`G_{7/2}` are from [#Weber1987]_, while
-        quantum defects for :math:`nP_{3/2}`,:math:`D_{3/2}` are from [#Lorenzen1984]_,
+        :math:`D_{3/2}` are from [#Lorenzen1984]_,
 
         Note:
             f_7/2 quantum defects are PUT TO BE EXACTLY the same as f_5/2 (~10MHz difference?!)
@@ -407,6 +416,15 @@ class Rubidium85(AlkaliAtom):
 
     """
 
+    alpha_d_eff = 9.089
+
+    alpha_q_eff = 16.8
+
+    """
+        Effective core polarisabilities from https://doi.org/10.1103/PhysRevA.102.062818
+
+    """
+
     a1 = [3.69628474, 4.44088978, 3.78717363, 2.39848933]
     """
         model potential parameters from [#c1]_
@@ -564,6 +582,14 @@ class Rubidium87(AlkaliAtom):
     """
         model potential parameters from [#c1]_
 
+    """
+    alpha_d_eff = 9.089
+
+    alpha_q_eff = 16.8
+
+    """
+        Effective core polarisabilities from https://doi.org/10.1103/PhysRevA.102.062818
+
     """
 
     a1 = [3.69628474, 4.44088978, 3.78717363, 2.39848933]
@@ -715,7 +741,17 @@ class Lithium6(AlkaliAtom):  # Li
     """
         model potential parameters from [#c1]_
 
+
+    """
+
+    alpha_d_eff = 0.1883
+
+    a_q_eff = 0.04579
+
+    """
+        (Effective) core plarisabiltiesm from https://doi.org/10.1103/PhysRevA.16.1141
     """
+
     # model potential parameters from Marinescu et.al, PRA 49:982 (1994)
     a1 = [2.47718079, 3.45414648, 2.51909839, 2.51909839]
     """
@@ -871,6 +907,15 @@ class Lithium7(AlkaliAtom):  # Li
         model potential parameters from [#c1]_
 
     """
+
+    alpha_d_eff = 0.1883
+
+    alpha_q_eff = 0.04579
+
+    """
+        (Effective) core plarisabiltiesm from https://doi.org/10.1103/PhysRevA.16.1141
+    """
+
     a1 = [2.47718079, 3.45414648, 2.51909839, 2.51909839]
     """
         model potential parameters from [#c1]_
@@ -1016,6 +1061,14 @@ class Sodium(AlkaliAtom):  # Na23
         model potential parameters from [#c1]_
 
     """
+
+    alpha_d_eff = 0.9980
+
+    alpha_q_eff = 0.351
+    """
+        (Effective) core plarisabiltiesm from https://doi.org/10.1103/PhysRevA.38.4985
+    """
+
     a1 = [4.82223117, 5.08382502, 3.53324124, 1.11056646]
     """
         model potential parameters from [#c1]_
@@ -1159,6 +1212,15 @@ class Potassium39(AlkaliAtom):
         model potential parameters from [#c1]_
 
     """
+
+    alpha_d_eff = 5.49
+
+    alpha_q_eff = 18
+
+    """
+        (Effective) core plarisabiltiesm from https://doi.org/10.1103/PhysRevA.100.012501
+    """
+
     a1 = [3.56079437, 3.65670429, 4.12713694, 1.42310446]
     """
         model potential parameters from [#c1]_
@@ -1201,22 +1263,22 @@ class Potassium39(AlkaliAtom):
     # quantum defects from Physica Scripta 27:300 (1983)
     quantumDefect = [
         [
-            [2.1801985, 0.13558, 0.0759, 0.117, -0.206, 0.0],
-            [1.713892, 0.233294, 0.16137, 0.5345, -0.234, 0.0],
-            [0.27697, -1.024911, -0.709174, 11.839, -26.689, 0.0],
-            [0.010098, -0.100224, 1.56334, -12.6851, 0.0, 0.0],
-            [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            [2.18020826, 0.134534, 0.0952, 0.0021, 0.0, 0.0],
+            [1.71392626, 0.23114, 0.1948, 0.3683, 0.0, 0.0],
+            [0.27698453, -1.02691, -0.665, 10.9, 0.0, 0.0],
+            [0.0094576, -0.0446, 0.0, 0.0, 0.0, 0.0],
+            [0.0024080, -0.0209, 0.0, 0.0, 0.0, 0.0],
         ],
         [
-            [2.1801985, 0.13558, 0.0759, 0.117, -0.206, 0.0],
-            [1.710848, 0.235437, 0.11551, 1.1015, -2.0356, 0.0],
-            [0.2771580, -1.025635, -0.59201, 10.0053, -19.0244, 0.0],
-            [0.010098, -0.100224, 1.56334, -12.6851, 0.0, 0.0],
-            [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            [2.18020826, 0.134534, 0.0952, 0.0021, 0.0, 0.0],
+            [1.71087854, 0.23233, 0.1961, 0.3716, 0.0, 0.0],
+            [0.27715665, -1.02493, -0.640, 10.0, 0.0, 0.0],
+            [0.0094576, -0.0446, 0.0, 0.0, 0.0, 0.0],
+            [0.0024080, -0.0209, 0.0, 0.0, 0.0, 0.0],
         ],
     ]
     """
-        quantum defects from Ref. [#c7]_.
+         p1/2 and p3/2, s1/2, d3/2, d5/2 and f and g (centre of manifold) from https://doi.org/10.1103/PhysRevA.100.012501
     """
 
     levelDataFromNIST = "k_NIST_level_data.ascii"
@@ -1309,6 +1371,15 @@ class Potassium40(AlkaliAtom):
         model potential parameters from [#c1]_
 
     """
+
+    alpha_d_eff = 5.49
+
+    alpha_q_eff = 18
+
+    """
+        (Effective) core plarisabiltiesm from https://doi.org/10.1103/PhysRevA.100.012501
+    """
+
     a1 = [3.56079437, 3.65670429, 4.12713694, 1.42310446]
     """
         model potential parameters from [#c1]_
@@ -1351,22 +1422,22 @@ class Potassium40(AlkaliAtom):
     # quantum defects from Physica Scripta 27:300 (1983)
     quantumDefect = [
         [
-            [2.1801985, 0.13558, 0.0759, 0.117, -0.206, 0.0],
-            [1.713892, 0.233294, 0.16137, 0.5345, -0.234, 0.0],
-            [0.27697, -1.024911, -0.709174, 11.839, -26.689, 0.0],
-            [0.010098, -0.100224, 1.56334, -12.6851, 0.0, 0.0],
-            [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            [2.18020826, 0.134534, 0.0952, 0.0021, 0.0, 0.0],
+            [1.71392626, 0.23114, 0.1948, 0.3683, 0.0, 0.0],
+            [0.27698453, -1.02691, -0.665, 10.9, 0.0, 0.0],
+            [0.0094576, -0.0446, 0.0, 0.0, 0.0, 0.0],
+            [0.0024080, -0.0209, 0.0, 0.0, 0.0, 0.0],
         ],
         [
-            [2.1801985, 0.13558, 0.0759, 0.117, -0.206, 0.0],
-            [1.710848, 0.235437, 0.11551, 1.1015, -2.0356, 0.0],
-            [0.2771580, -1.025635, -0.59201, 10.0053, -19.0244, 0.0],
-            [0.010098, -0.100224, 1.56334, -12.6851, 0.0, 0.0],
-            [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            [2.18020826, 0.134534, 0.0952, 0.0021, 0.0, 0.0],
+            [1.71087854, 0.23233, 0.1961, 0.3716, 0.0, 0.0],
+            [0.27715665, -1.02493, -0.640, 10.0, 0.0, 0.0],
+            [0.0094576, -0.0446, 0.0, 0.0, 0.0, 0.0],
+            [0.0024080, -0.0209, 0.0, 0.0, 0.0, 0.0],
         ],
     ]
     """
-        quantum defects from Ref. [#c7]_.
+         p1/2 and p3/2, s1/2, d3/2, d5/2 and f and g (centre of manifold) from https://doi.org/10.1103/PhysRevA.100.012501
     """
 
     levelDataFromNIST = "k_NIST_level_data.ascii"
@@ -1449,6 +1520,15 @@ class Potassium41(AlkaliAtom):
         model potential parameters from [#c1]_
 
     """
+
+    alpha_d_eff = 5.49
+
+    alpha_q_eff = 18
+
+    """
+        (Effective) core plarisabiltiesm from https://doi.org/10.1103/PhysRevA.100.012501
+    """
+
     a1 = [3.56079437, 3.65670429, 4.12713694, 1.42310446]
     """
         model potential parameters from [#c1]_
@@ -1491,22 +1571,22 @@ class Potassium41(AlkaliAtom):
     # quantum defects from Physica Scripta 27:300 (1983)
     quantumDefect = [
         [
-            [2.1801985, 0.13558, 0.0759, 0.117, -0.206, 0.0],
-            [1.713892, 0.233294, 0.16137, 0.5345, -0.234, 0.0],
-            [0.27697, -1.024911, -0.709174, 11.839, -26.689, 0.0],
-            [0.010098, -0.100224, 1.56334, -12.6851, 0.0, 0.0],
-            [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            [2.18020826, 0.134534, 0.0952, 0.0021, 0.0, 0.0],
+            [1.71392626, 0.23114, 0.1948, 0.3683, 0.0, 0.0],
+            [0.27698453, -1.02691, -0.665, 10.9, 0.0, 0.0],
+            [0.0094576, -0.0446, 0.0, 0.0, 0.0, 0.0],
+            [0.0024080, -0.0209, 0.0, 0.0, 0.0, 0.0],
         ],
         [
-            [2.1801985, 0.13558, 0.0759, 0.117, -0.206, 0.0],
-            [1.710848, 0.235437, 0.11551, 1.1015, -2.0356, 0.0],
-            [0.2771580, -1.025635, -0.59201, 10.0053, -19.0244, 0.0],
-            [0.010098, -0.100224, 1.56334, -12.6851, 0.0, 0.0],
-            [0.0, 0.0, 0.0, 0.0, 0.0, 0.0],
+            [2.18020826, 0.134534, 0.0952, 0.0021, 0.0, 0.0],
+            [1.71087854, 0.23233, 0.1961, 0.3716, 0.0, 0.0],
+            [0.27715665, -1.02493, -0.640, 10.0, 0.0, 0.0],
+            [0.0094576, -0.0446, 0.0, 0.0, 0.0, 0.0],
+            [0.0024080, -0.0209, 0.0, 0.0, 0.0, 0.0],
         ],
     ]
     """
-        quantum defects from Ref. [#c7]_.
+        p1/2 and p3/2, s1/2, d3/2, d5/2 and f and g (centre of manifold) from https://doi.org/10.1103/PhysRevA.100.012501
     """
 
     levelDataFromNIST = "k_NIST_level_data.ascii"