cherab · jacklovell · Aug 1, 2024 · Dec 30, 2022 · Jan 9, 2023 · Jan 10, 2023
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ Project Changelog
 Release 1.5.0 (TBD)
 -------------------
 
+API changes:
+* The line shape models are moved to a dedicated submodule. The user code should not be affected though. (#396)
+* The line shape models now have AtomicData as a required parameter.
+* The method show_supported_transitions() of StarkBroadenedLine and ParametrisedZeemanTriplet is removed.
+* The argument stark_model_coefficients of StarkBroadenedLine is now a tuple instead of a dict.
+* The argument line_parameters of ParametrisedZeemanTriplet is now a tuple instead of a dict.
+
 New:
 * Support Raysect 0.8
 * Add custom line shape support to BeamCXLine model. (#394)
@@ -16,6 +23,7 @@ New:
 * **Beam dispersion calculation has changed from sigma(z) = sigma + z * tan(alpha) to sigma(z) = sqrt(sigma^2 + (z * tan(alpha))^2) for consistancy with the Gaussian beam model. Attention!!! The results of BES and CX spectroscopy are affected by this change. (#414)**
 * Improved beam direction calculation to allow for natural broadening of the BES line shape due to beam divergence. (#414)
 * Add kwargs to invert_regularised_nnls to pass them to scipy.optimize.nnls. (#438)
+* StarkBroadenedLine now supports Doppler broadening and Zeeman splitting. (#393)
 * Add thermal charge-exchange emission model. (#57)
 * PECs for C VI spectral lines for n <= 5 are now included in populate(). Rerun populate() after upgrading to 1.5 to update the atomic data repository.
 * All interpolated atomic rates now return 0 if plasma parameters <= 0, which matches the behaviour of emission models. (#450)

diff --git a/cherab/core/atomic/data/lineshape/stark/d.json b/cherab/core/atomic/data/lineshape/stark/d.json
@@ -0,0 +1,70 @@
+{
+    "0": {
+        "3 -> 2": [
+            3.71e-18,
+            0.7665,
+            0.064
+        ],
+        "4 -> 2": [
+            8.425e-18,
+            0.7803,
+            0.050
+        ],
+        "5 -> 2": [
+            1.31e-15,
+            0.6796,
+            0.030
+        ],
+        "6 -> 2": [
+            3.954e-16,
+            0.7149,
+            0.028
+        ],
+        "7 -> 2": [
+            6.258e-16,
+            0.712,
+            0.029
+        ],
+        "8 -> 2": [
+            7.378e-16,
+            0.7159,
+            0.032
+        ],
+        "9 -> 2": [
+            8.947e-16,
+            0.7177,
+            0.033
+        ],
+        "4 -> 3": [
+            1.330e-16,
+            0.7449,
+            0.045
+        ],
+        "5 -> 3": [
+            6.64e-16,
+            0.7356,
+            0.044
+        ],
+        "6 -> 3": [
+            2.481e-15,
+            0.7118,
+            0.016
+        ],
+        "7 -> 3": [
+            3.270e-15,
+            0.7137,
+            0.029
+        ],
+        "8 -> 3": [
+            4.343e-15,
+            0.7133,
+            0.032
+        ],
+        "9 -> 3": [
+            5.588e-15,
+            0.7165,
+            0.033
+        ]
+    },
+    "reference": "B. Lomanowski, et al. Inferring divertor plasma properties from hydrogen Balmer and Paschen series spectroscopy in JET-ILW. Nuclear Fusion 55.12 (2015) <a href=\"https://doi.org/10.1088/0029-5515/55/12/123028\">123028</a>"
+}
diff --git a/cherab/core/atomic/data/lineshape/stark/h.json b/cherab/core/atomic/data/lineshape/stark/h.json
@@ -0,0 +1,70 @@
+{
+    "0": {
+        "3 -> 2": [
+            3.71e-18,
+            0.7665,
+            0.064
+        ],
+        "4 -> 2": [
+            8.425e-18,
+            0.7803,
+            0.050
+        ],
+        "5 -> 2": [
+            1.31e-15,
+            0.6796,
+            0.030
+        ],
+        "6 -> 2": [
+            3.954e-16,
+            0.7149,
+            0.028
+        ],
+        "7 -> 2": [
+            6.258e-16,
+            0.712,
+            0.029
+        ],
+        "8 -> 2": [
+            7.378e-16,
+            0.7159,
+            0.032
+        ],
+        "9 -> 2": [
+            8.947e-16,
+            0.7177,
+            0.033
+        ],
+        "4 -> 3": [
+            1.330e-16,
+            0.7449,
+            0.045
+        ],
+        "5 -> 3": [
+            6.64e-16,
+            0.7356,
+            0.044
+        ],
+        "6 -> 3": [
+            2.481e-15,
+            0.7118,
+            0.016
+        ],
+        "7 -> 3": [
+            3.270e-15,
+            0.7137,
+            0.029
+        ],
+        "8 -> 3": [
+            4.343e-15,
+            0.7133,
+            0.032
+        ],
+        "9 -> 3": [
+            5.588e-15,
+            0.7165,
+            0.033
+        ]
+    },
+    "reference": "B. Lomanowski, et al. Inferring divertor plasma properties from hydrogen Balmer and Paschen series spectroscopy in JET-ILW. Nuclear Fusion 55.12 (2015) <a href=\"https://doi.org/10.1088/0029-5515/55/12/123028\">123028</a>"
+}
diff --git a/cherab/core/atomic/data/lineshape/stark/t.json b/cherab/core/atomic/data/lineshape/stark/t.json
@@ -0,0 +1,70 @@
+{
+    "0": {
+        "3 -> 2": [
+            3.71e-18,
+            0.7665,
+            0.064
+        ],
+        "4 -> 2": [
+            8.425e-18,
+            0.7803,
+            0.050
+        ],
+        "5 -> 2": [
+            1.31e-15,
+            0.6796,
+            0.030
+        ],
+        "6 -> 2": [
+            3.954e-16,
+            0.7149,
+            0.028
+        ],
+        "7 -> 2": [
+            6.258e-16,
+            0.712,
+            0.029
+        ],
+        "8 -> 2": [
+            7.378e-16,
+            0.7159,
+            0.032
+        ],
+        "9 -> 2": [
+            8.947e-16,
+            0.7177,
+            0.033
+        ],
+        "4 -> 3": [
+            1.330e-16,
+            0.7449,
+            0.045
+        ],
+        "5 -> 3": [
+            6.64e-16,
+            0.7356,
+            0.044
+        ],
+        "6 -> 3": [
+            2.481e-15,
+            0.7118,
+            0.016
+        ],
+        "7 -> 3": [
+            3.270e-15,
+            0.7137,
+            0.029
+        ],
+        "8 -> 3": [
+            4.343e-15,
+            0.7133,
+            0.032
+        ],
+        "9 -> 3": [
+            5.588e-15,
+            0.7165,
+            0.033
+        ]
+    },
+    "reference": "B. Lomanowski, et al. Inferring divertor plasma properties from hydrogen Balmer and Paschen series spectroscopy in JET-ILW. Nuclear Fusion 55.12 (2015) <a href=\"https://doi.org/10.1088/0029-5515/55/12/123028\">123028</a>"
+}
diff --git a/cherab/core/atomic/data/lineshape/zeeman/parametrised/b.json b/cherab/core/atomic/data/lineshape/zeeman/parametrised/b.json
@@ -0,0 +1,35 @@
+{
+    "4": {
+        "6 -> 5": [
+            0.0083423,
+            2.0519,
+            -0.2960
+        ],
+        "7 -> 6": [
+            0.0228379,
+            1.6546,
+            -0.2941
+        ],
+        "8 -> 6": [
+            0.0084065,
+            1.8041,
+            -0.3177
+        ],
+        "8 -> 7": [
+            0.0541883,
+            1.4128,
+            -0.2966
+        ],
+        "9 -> 7": [
+            0.0190781,
+            1.5440,
+            -0.3211
+        ],
+        "10 -> 8": [
+            0.0391914,
+            1.3569,
+            -0.3252
+        ]
+    },
+    "reference": "A. Blom and C. Jupén. Parametrisation of the Zeeman effect for hydrogen-like spectra in high-temperature plasmas. Plasma Phys. Control. Fusion 44 (2002) <a href=\"https://doi.org/10.1088/0741-3335/44/7/312\">1229-1241</a>"
+}
diff --git a/cherab/core/atomic/data/lineshape/zeeman/parametrised/be.json b/cherab/core/atomic/data/lineshape/zeeman/parametrised/be.json
@@ -0,0 +1,25 @@
+{
+    "3": {
+        "5 -> 4": [
+            0.0060354,
+            2.1245,
+            -0.3190
+        ],
+        "6 -> 5": [
+            0.0202754,
+            1.6538,
+            -0.3192
+        ],
+        "7 -> 5": [
+            0.0078966,
+            1.7017,
+            -0.3348
+        ],
+        "8 -> 6": [
+            0.0205025,
+            1.4581,
+            -0.3450
+        ]
+    },
+    "reference": "A. Blom and C. Jupén. Parametrisation of the Zeeman effect for hydrogen-like spectra in high-temperature plasmas. Plasma Phys. Control. Fusion 44 (2002) <a href=\"https://doi.org/10.1088/0741-3335/44/7/312\">1229-1241</a>"
+}
diff --git a/cherab/core/atomic/data/lineshape/zeeman/parametrised/c.json b/cherab/core/atomic/data/lineshape/zeeman/parametrised/c.json
@@ -0,0 +1,45 @@
+{
+    "5": {
+        "6 -> 5": [
+            0.0040900,
+            2.4271,
+            -0.2818
+        ],
+        "7 -> 6": [
+            0.0110398,
+            1.9785,
+            -0.2816
+        ],
+        "8 -> 6": [
+            0.0040747,
+            2.1776,
+            -0.3035
+        ],
+        "8 -> 7": [
+            0.0261405,
+            1.6689,
+            -0.2815
+        ],
+        "9 -> 7": [
+            0.0092096,
+            1.8495,
+            -0.3049
+        ],
+        "10 -> 8": [
+            0.0189020,
+            1.6191,
+            -0.3078
+        ],
+        "11 -> 8": [
+            0.0110428,
+            1.6600,
+            -0.3162
+        ],
+        "10 -> 9": [
+            0.0359009,
+            1.4464,
+            -0.3104
+        ]
+    },
+    "reference": "A. Blom and C. Jupén. Parametrisation of the Zeeman effect for hydrogen-like spectra in high-temperature plasmas. Plasma Phys. Control. Fusion 44 (2002) <a href=\"https://doi.org/10.1088/0741-3335/44/7/312\">1229-1241</a>"
+}
diff --git a/cherab/core/atomic/data/lineshape/zeeman/parametrised/d.json b/cherab/core/atomic/data/lineshape/zeeman/parametrised/d.json
@@ -0,0 +1,15 @@
+{
+    "0": {
+        "3 -> 2": [
+            0.0402068,
+            0.4384,
+            -0.5015
+        ],
+        "4 -> 2": [
+            0.0220610,
+            0.3702,
+            -0.5132
+        ]
+    },
+    "reference": "A. Blom and C. Jupén. Parametrisation of the Zeeman effect for hydrogen-like spectra in high-temperature plasmas. Plasma Phys. Control. Fusion 44 (2002) <a href=\"https://doi.org/10.1088/0741-3335/44/7/312\">1229-1241</a>"
+}
diff --git a/cherab/core/atomic/data/lineshape/zeeman/parametrised/h.json b/cherab/core/atomic/data/lineshape/zeeman/parametrised/h.json
@@ -0,0 +1,15 @@
+{
+    "0": {
+        "3 -> 2": [
+            0.0402267,
+            0.3415,
+            -0.5247
+        ],
+        "4 -> 2": [
+            0.0220724,
+            0.2837,
+            -0.5346
+        ]
+    },
+    "reference": "A. Blom and C. Jupén. Parametrisation of the Zeeman effect for hydrogen-like spectra in high-temperature plasmas. Plasma Phys. Control. Fusion 44 (2002) <a href=\"https://doi.org/10.1088/0741-3335/44/7/312\">1229-1241</a>"
+}