Skip to content

Commit

Permalink
reformatted files appropriately
Browse files Browse the repository at this point in the history
  • Loading branch information
jaadt7 committed Oct 13, 2023
1 parent da226c5 commit 535515f
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 12 deletions.
5 changes: 4 additions & 1 deletion lvlspy/level.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,10 @@ def __eq__(self, other):
if not isinstance(other, Level):
return NotImplemented

return self.energy == other.energy and self.multiplicity == other.multiplicity
return (
self.energy == other.energy
and self.multiplicity == other.multiplicity
)

def get_energy(self, units="keV"):
"""Method to retrieve the energy for a level.
Expand Down
24 changes: 18 additions & 6 deletions lvlspy/spcoll.py
Original file line number Diff line number Diff line change
Expand Up @@ -125,15 +125,23 @@ def _add_transitions_to_xml(self, xml_level, species, level, units):
xml_transitions = etree.SubElement(xml_level, "transitions")

for lower_level in lower_levels:
transition = species.get_level_to_level_transition(level, lower_level)
transition = species.get_level_to_level_transition(
level, lower_level
)
xml_trans = etree.SubElement(xml_transitions, "transition")
self._add_optional_properties(xml_trans, transition)
if units != "keV":
xml_to_energy = etree.SubElement(xml_trans, "to_energy", units=units)
xml_to_energy = etree.SubElement(
xml_trans, "to_energy", units=units
)
else:
xml_to_energy = etree.SubElement(xml_trans, "to_energy")
xml_to_energy.text = self._get_energy_text(lower_level.get_energy(), units)
xml_to_multiplicity = etree.SubElement(xml_trans, "to_multiplicity")
xml_to_energy.text = self._get_energy_text(
lower_level.get_energy(), units
)
xml_to_multiplicity = etree.SubElement(
xml_trans, "to_multiplicity"
)
xml_to_multiplicity.text = str(lower_level.get_multiplicity())
xml_a = etree.SubElement(xml_trans, "a")
xml_a.text = str(transition.get_einstein_a())
Expand Down Expand Up @@ -213,7 +221,9 @@ def validate(self, file):
xml = etree.parse(file, parser)
xml.xinclude()

schema_file = os.path.join(os.path.dirname(__file__), "xsd_pub/spcoll.xsd")
schema_file = os.path.join(
os.path.dirname(__file__), "xsd_pub/spcoll.xsd"
)
xmlschema_doc = etree.parse(schema_file)

xml_validator = etree.XMLSchema(xmlschema_doc)
Expand Down Expand Up @@ -254,7 +264,9 @@ def _get_species_from_xml(self, xml_species):
level_dict[new_level.get_energy()] = new_level

for xml_trans in xml_level.xpath(".//transition"):
trans = self._get_transition_from_xml(xml_trans, new_level, level_dict)
trans = self._get_transition_from_xml(
xml_trans, new_level, level_dict
)
if trans:
result.add_transition(trans)

Expand Down
8 changes: 6 additions & 2 deletions lvlspy/species.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,8 +253,12 @@ def compute_rate_matrix(self, temperature):
i_upper = levels.index(transition.get_upper_level())
i_lower = levels.index(transition.get_lower_level())

r_upper_to_lower = transition.compute_upper_to_lower_rate(temperature)
r_lower_to_upper = transition.compute_lower_to_upper_rate(temperature)
r_upper_to_lower = transition.compute_upper_to_lower_rate(
temperature
)
r_lower_to_upper = transition.compute_lower_to_upper_rate(
temperature
)

rate_matrix[i_lower, i_upper] += r_upper_to_lower
rate_matrix[i_upper, i_upper] -= r_upper_to_lower
Expand Down
8 changes: 5 additions & 3 deletions lvlspy/transition.py
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,8 @@ def get_einstein_b_lower_to_upper(self):
"""

return self.get_einstein_b_upper_to_lower() * (
self.upper_level.get_multiplicity() / self.lower_level.get_multiplicity()
self.upper_level.get_multiplicity()
/ self.lower_level.get_multiplicity()
)

def compute_lower_to_upper_rate(self, temperature, user_func=None):
Expand Down Expand Up @@ -168,8 +169,9 @@ def compute_upper_to_lower_rate(self, temperature, user_func=None):
if user_func:
return user_func(temperature)

return self.get_einstein_a() + self.get_einstein_b_upper_to_lower() * self._bb(
temperature
return (
self.get_einstein_a()
+ self.get_einstein_b_upper_to_lower() * self._bb(temperature)
)

def get_frequency(self):
Expand Down

0 comments on commit 535515f

Please sign in to comment.