fix some of josh's requests

tardis-sn · Jan 13, 2024 · 8e0f3a9 · 8e0f3a9
1 parent 2447542
commit 8e0f3a9
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 10 deletions.
diff --git a/tardis/grid/tests/test_grid.py b/tardis/grid/tests/test_grid.py
@@ -4,11 +4,8 @@
 import pandas as pd
 
 import tardis
-
-from pathlib import Path
 import tardis.grid as grid
 
-
 DATA_PATH = Path(tardis.__path__[0]) / "grid" / "tests" / "data"
 
 

diff --git a/tardis/io/model_reader.py b/tardis/io/model_reader.py
@@ -12,7 +12,7 @@
 from radioactivedecay.utils import Z_DICT, elem_to_Z
 
 from tardis.io.configuration.config_reader import ConfigurationNameSpace
-from tardis.montecarlo.base import MontecarloTransportSolver
+from tardis.montecarlo.base import MonteCarloTransportSolver
 from tardis.montecarlo.packet_source import (
     BlackBodySimpleSource,
     BlackBodySimpleSourceRelativistic,
@@ -726,7 +726,7 @@ def transport_from_hdf(fname):
     )
 
     # Creating a transport object and storing data
-    new_transport = MontecarloTransportSolver(
+    new_transport = MonteCarloTransportSolver(
         spectrum_frequency=d["spectrum_frequency_cgs"],
         virtual_spectrum_spawn_range=d["virtual_spectrum_spawn_range"],
         disable_electron_scattering=d["disable_electron_scattering"],

diff --git a/tardis/model/parse_input.py b/tardis/model/parse_input.py
@@ -5,7 +5,6 @@
 import pandas as pd
 from astropy import units as u
 
-from tardis import constants as const
 from tardis import constants as const
 from tardis.io.model.parse_density_configuration import (
     calculate_density_after_time,
@@ -595,7 +594,6 @@ def parse_packet_source(config, geometry):
         If both t_inner and luminosity_requested are None.
 
     """
-
     if config.montecarlo.enable_full_relativity:
         packet_source = BlackBodySimpleSourceRelativistic(
             base_seed=config.montecarlo.seed,

diff --git a/tardis/montecarlo/base.py b/tardis/montecarlo/base.py
@@ -28,7 +28,7 @@
 
 
 # TODO: refactor this into more parts
-class MontecarloTransportSolver(HDFWriterMixin):
+class MonteCarloTransportSolver(HDFWriterMixin):
     """
     This class is designed as an interface between the Python part and the
     montecarlo C-part

diff --git a/tardis/simulation/base.py b/tardis/simulation/base.py
@@ -15,7 +15,7 @@
 from tardis.io.util import HDFWriterMixin
 from tardis.model import SimulationState
 from tardis.montecarlo import montecarlo_configuration as mc_config_module
-from tardis.montecarlo.base import MontecarloTransportSolver
+from tardis.montecarlo.base import MonteCarloTransportSolver
 from tardis.montecarlo.montecarlo_numba.r_packet import (
     rpacket_trackers_to_dataframe,
 )
@@ -708,7 +708,7 @@ def from_config(
                 )
             transport = kwargs["transport"]
         else:
-            transport = MontecarloTransportSolver.from_config(
+            transport = MonteCarloTransportSolver.from_config(
                 config,
                 packet_source=simulation_state.packet_source,
                 enable_virtual_packet_logging=virtual_packet_logging,