Skip to content

Commit

Permalink
Ruff formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
ccollins22 committed Jul 3, 2024
1 parent 859840a commit 5a8cfee
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 6 deletions.
2 changes: 1 addition & 1 deletion artisatomic/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -487,7 +487,7 @@ def process_files(ion_handlers: list[tuple[int, list[int | tuple[int, str]]]], a
transition_count_of_level_name[i],
) = readtanakajpltdata.read_levels_and_transitions(atomic_number, ion_stage, flog)

elif handler == "gsnist": #ground states taken from NIST
elif handler == "gsnist": # ground states taken from NIST
(
ionization_energy_ev[i],
energy_levels[i],
Expand Down
21 changes: 16 additions & 5 deletions artisatomic/groundstatesonlynist.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,17 @@

hc_in_ev_cm = (const.h * const.c).to("eV cm").value


class EnergyLevel(t.NamedTuple):
levelname: str
energyabovegsinpercm: float
g: float
parity: float


datafilepath = Path(os.path.dirname(os.path.abspath(__file__)), "..", "atomic-data-groundstatesonlynist", "groundstates.dat")
datafilepath = Path(
os.path.dirname(os.path.abspath(__file__)), "..", "atomic-data-groundstatesonlynist", "groundstates.dat"
)


def read_ground_levels(atomic_number, ion_stage, flog):
Expand All @@ -28,8 +31,14 @@ def read_ground_levels(atomic_number, ion_stage, flog):
ionization_energy_in_ev = this_ion["IonizationEnergy"].to_numpy()[0]
artisatomic.log_and_print(flog, f"ionization energy: {ionization_energy_in_ev} eV")
energy_levels = [None]
energy_levels.append(EnergyLevel(levelname=this_ion["config"].to_numpy()[0], parity=0, g=this_ion["g"].to_numpy()[0],
energyabovegsinpercm=0.0))
energy_levels.append(
EnergyLevel(
levelname=this_ion["config"].to_numpy()[0],
parity=0,
g=this_ion["g"].to_numpy()[0],
energyabovegsinpercm=0.0,
)
)

transitions = []
transition_count_of_level_name = defaultdict(int)
Expand All @@ -54,8 +63,10 @@ def extend_ion_list(ion_handlers):

if not found_element:
ion_handlers.append(
(atomic_number,
[(ion_stage, "gsnist")],)
(
atomic_number,
[(ion_stage, "gsnist")],
)
)
ion_handlers.sort(key=lambda x: x[0])
return ion_handlers

0 comments on commit 5a8cfee

Please sign in to comment.