Refactor code to address comments

tardis-sn · Jul 29, 2024 · 3fdce9a · 3fdce9a
1 parent 8d67db8
commit 3fdce9a
Show file tree

Hide file tree

Showing 7 changed files with 7 additions and 11 deletions.
diff --git a/tardis/energy_input/gamma_packet_loop.py b/tardis/energy_input/gamma_packet_loop.py
@@ -19,11 +19,9 @@
     doppler_factor_3d,
     get_index,
 )
-from tardis.opacities.compton_opacity_calculation import (
-    compton_opacity_calculation,
-)
 from tardis.opacities.opacities import (
     SIGMA_T,
+    compton_opacity_calculation,
     kappa_calculation,
     pair_creation_opacity_artis,
     pair_creation_opacity_calculation,

diff --git a/tardis/energy_input/gamma_ray_estimators.py b/tardis/energy_input/gamma_ray_estimators.py
@@ -7,11 +7,9 @@
     angle_aberration_gamma,
     doppler_factor_3d,
 )
-from tardis.opacities.compton_opacity_calculation import (
-    compton_opacity_calculation,
-)
 from tardis.opacities.opacities import (
     SIGMA_T,
+    compton_opacity_calculation,
     kappa_calculation,
     photoabsorption_opacity_calculation,
 )

diff --git a/tardis/plasma/properties/continuum_processes/photo_ion_rate_coeff.py b/tardis/plasma/properties/continuum_processes/photo_ion_rate_coeff.py
@@ -1,5 +1,4 @@
 from tardis.plasma.properties.base import Input
-from tardis.plasma.properties.continuum_processes.rates import H
 
 
 class PhotoIonRateCoeff(Input):

diff --git a/tardis/plasma/properties/continuum_processes/recomb_rate_coeff.py b/tardis/plasma/properties/continuum_processes/recomb_rate_coeff.py
@@ -1,13 +1,14 @@
 import numpy as np
 import pandas as pd
 
+import tardis.constants as const
 from tardis.plasma.properties.base import Input, ProcessingPlasmaProperty
-from tardis.plasma.properties.continuum_processes.rates import C, H
 from tardis.transport.montecarlo.estimators.util import (
-    bound_free_estimator_array2frame,
     integrate_array_by_blocks,
 )
 
+C = const.c.cgs.value
+
 
 class StimRecombRateFactor(Input):
     """

diff --git a/tardis/transport/montecarlo/base.py b/tardis/transport/montecarlo/base.py
@@ -11,7 +11,7 @@
     MonteCarloConfiguration,
     configuration_initialize,
 )
-from tardis.transport.montecarlo.estimators.dilute_blackbody_properties import (
+from tardis.transport.montecarlo.estimators.mc_rad_field_solver import (
     MCRadiationFieldPropertiesSolver,
 )
 from tardis.transport.montecarlo.estimators.radfield_mc_estimators import (

diff --git a/...estimators/dilute_blackbody_properties.py → ...tecarlo/estimators/mc_rad_field_solver.py b/...estimators/dilute_blackbody_properties.py → ...tecarlo/estimators/mc_rad_field_solver.py
diff --git a/tardis/transport/montecarlo/montecarlo_transport_state.py b/tardis/transport/montecarlo/montecarlo_transport_state.py
@@ -4,7 +4,7 @@
 from astropy import units as u
 
 from tardis.io.util import HDFWriterMixin
-from tardis.transport.montecarlo.estimators.dilute_blackbody_properties import (
+from tardis.transport.montecarlo.estimators.mc_rad_field_solver import (
     MCRadiationFieldPropertiesSolver,
 )
 from tardis.spectrum.formal_integral import IntegrationError