Skip to content

Commit 6f14205

Browse files
Backport PR #252: Fix the definition of hydrogenic and helium-like ions (#253)
Co-authored-by: Jeffrey Reep <33359703+jwreep@users.noreply.github.com>
1 parent 118433f commit 6f14205

File tree

1 file changed

+10
-7
lines changed

1 file changed

+10
-7
lines changed

fiasco/ions.py

+10-7
Original file line numberDiff line numberDiff line change
@@ -226,9 +226,9 @@ def hydrogenic(self):
226226
227227
Notes
228228
-----
229-
This is `True` if :math:`Z - z = 1` and :math:`Z\ge6`.
229+
This is `True` if :math:`Z - z = 1`.
230230
"""
231-
return (self.atomic_number - self.charge_state == 1) and (self.atomic_number >= 6)
231+
return (self.atomic_number - self.charge_state == 1)
232232

233233
@property
234234
def helium_like(self):
@@ -237,9 +237,9 @@ def helium_like(self):
237237
238238
Notes
239239
-----
240-
This is `True` if :math:`Z - z = 2` and :math:`Z\ge10`.
240+
This is `True` if :math:`Z - z = 2`.
241241
"""
242-
return (self.atomic_number - self.charge_state == 2) and (self.atomic_number >= 10)
242+
return (self.atomic_number - self.charge_state == 2)
243243

244244
@property
245245
@u.quantity_input
@@ -906,8 +906,10 @@ def direct_ionization_cross_section(self, energy: u.erg) -> u.cm**2:
906906
Direct ionization cross-section as a function of energy.
907907
908908
The direction ionization cross-section is calculated one of two ways.
909-
For H and He like ions, the cross-section is computed according to
910-
the method of :cite:t:`fontes_fully_1999`,
909+
See :cite:t:`dere_ionization_2007`, Sections 3.1 and 3.2 for details.
910+
For H-like ions with :math:`Z\ge6` and He-like ions with :math:`Z\ge10`,
911+
the cross-section is computed according to the method of
912+
:cite:t:`fontes_fully_1999`,
911913
912914
.. math::
913915
@@ -940,7 +942,8 @@ def direct_ionization_cross_section(self, energy: u.erg) -> u.cm**2:
940942
:math:`U,f,\Sigma` are all stored in the CHIANTI database such that :math:`\sigma_I`
941943
can be computed for a given :math:`E`.
942944
"""
943-
if self.hydrogenic or self.helium_like:
945+
if ((self.hydrogenic and self.atomic_number >= 6) or
946+
(self.helium_like and self.atomic_number >= 10)):
944947
return self._fontes_cross_section(energy)
945948
else:
946949
return self._dere_cross_section(energy)

0 commit comments

Comments
 (0)