fix radiation broadening and unpin tardis

tardis-sn · Oct 26, 2023 · cd08e1c · cd08e1c
1 parent 722270f
commit cd08e1c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/conda-linux-64-cuda.lock b/conda-linux-64-cuda.lock
@@ -319,4 +319,4 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#
 https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-3.6.5-pyhd8ed1ab_0.conda#27e94943c68cc04f54125faa76c52fba
 https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.8.0-pyhd8ed1ab_0.conda#518b05adab6cfe6ea249319932d9d4a3
 https://conda.anaconda.org/conda-forge/noarch/qgrid-1.3.1-pyhd8ed1ab_4.tar.bz2#fff68c7404813a1eb2678425f00e9917
-# pip tardis @ git+https://github.com/tardis-sn/tardis.git@b3b7fb230e2930c4e1e0e89d3d67cd0446156da4
+# pip tardis @ git+https://github.com/tardis-sn/tardis.git
diff --git a/conda-linux-64.lock b/conda-linux-64.lock
@@ -316,4 +316,4 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#
 https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-3.6.5-pyhd8ed1ab_0.conda#27e94943c68cc04f54125faa76c52fba
 https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.8.0-pyhd8ed1ab_0.conda#518b05adab6cfe6ea249319932d9d4a3
 https://conda.anaconda.org/conda-forge/noarch/qgrid-1.3.1-pyhd8ed1ab_4.tar.bz2#fff68c7404813a1eb2678425f00e9917
-# pip tardis @ git+https://github.com/tardis-sn/tardis.git@b3b7fb230e2930c4e1e0e89d3d67cd0446156da4
+# pip tardis @ git+https://github.com/tardis-sn/tardis.git
diff --git a/conda-osx-64.lock b/conda-osx-64.lock
@@ -301,4 +301,4 @@ https://conda.anaconda.org/conda-forge/noarch/notebook-7.0.2-pyhd8ed1ab_0.conda#
 https://conda.anaconda.org/conda-forge/noarch/widgetsnbextension-3.6.5-pyhd8ed1ab_0.conda#27e94943c68cc04f54125faa76c52fba
 https://conda.anaconda.org/conda-forge/noarch/ipywidgets-7.8.0-pyhd8ed1ab_0.conda#518b05adab6cfe6ea249319932d9d4a3
 https://conda.anaconda.org/conda-forge/noarch/qgrid-1.3.1-pyhd8ed1ab_4.tar.bz2#fff68c7404813a1eb2678425f00e9917
-# pip tardis @ git+https://github.com/tardis-sn/tardis.git@b3b7fb230e2930c4e1e0e89d3d67cd0446156da4
+# pip tardis @ git+https://github.com/tardis-sn/tardis.git
diff --git a/stardis/plasma/base.py b/stardis/plasma/base.py
@@ -252,7 +252,9 @@ def calculate(
         linelist["level_energy_lower"] = ((linelist["e_low"].values * u.eV).cgs).value
         linelist["level_energy_upper"] = ((linelist["e_up"].values * u.eV).cgs).value
         ###TODO THIS IS WRONG - Fix this later
-        linelist["A_ul"] = linelist["rad"]
+        linelist["A_ul"] = 10 ** (
+            linelist["rad"]
+        )  # see 1995A&AS..112..525P for appropriate units - may be off by a factor of 4pi
 
         # this might be improperly named - it's actually the indices of everything that aren't autoionizing
         autoionization_indices = (