diff --git a/docs/physics/update_and_conv/update_and_conv.ipynb b/docs/physics/update_and_conv/update_and_conv.ipynb index b0c8da0d24c..cb8f874d945 100644 --- a/docs/physics/update_and_conv/update_and_conv.ipynb +++ b/docs/physics/update_and_conv/update_and_conv.ipynb @@ -311,7 +311,7 @@ }, "outputs": [], "source": [ - "j_estimator = transport.transport_state.estimators.j_estimator * (u.erg * u.cm) \n", + "j_estimator = transport.transport_state.j_estimator * (u.erg * u.cm) \n", "j_estimator" ] }, @@ -324,7 +324,7 @@ }, "outputs": [], "source": [ - "nu_bar_estimator = transport.transport_state.estimators.nu_bar_estimator * (u.erg * u.cm * u.Hz)\n", + "nu_bar_estimator = transport.transport_state.nu_bar_estimator * (u.erg * u.cm * u.Hz)\n", "nu_bar_estimator" ] }, diff --git a/tardis/model/parse_input.py b/tardis/model/parse_input.py index ceddfa04984..3232b769ad9 100644 --- a/tardis/model/parse_input.py +++ b/tardis/model/parse_input.py @@ -616,6 +616,7 @@ def initialize_packet_source(config, geometry, packet_source): ) return packet_source + def parse_packet_source(config, geometry): """ Parse the packet source based on the given configuration and geometry. diff --git a/tardis/montecarlo/base.py b/tardis/montecarlo/base.py index 6820c61b98d..08ff1612306 100644 --- a/tardis/montecarlo/base.py +++ b/tardis/montecarlo/base.py @@ -184,7 +184,7 @@ def run( transport_state.geometry_state, numba_model, transport_state.opacity_state, - transport_state.estimators, + transport_state.radfield_mc_estimators, transport_state.spectrum_frequency.value, number_of_vpackets, iteration=iteration, @@ -233,8 +233,8 @@ def legacy_return(self): return ( self.transport_state.packet_collection.output_nus, self.transport_state.packet_collection.output_energies, - self.transport_state.estimators.j_estimator, - self.transport_state.estimators.nu_bar_estimator, + self.transport_state.j_estimator, + self.transport_state.nu_bar_estimator, self.transport_state.last_line_interaction_in_id, self.transport_state.last_line_interaction_out_id, self.transport_state.last_interaction_type, diff --git a/tardis/montecarlo/estimators/dilute_blackbody_properties.py b/tardis/montecarlo/estimators/dilute_blackbody_properties.py index e1ad17ff1f5..8e7c98c7ed7 100644 --- a/tardis/montecarlo/estimators/dilute_blackbody_properties.py +++ b/tardis/montecarlo/estimators/dilute_blackbody_properties.py @@ -48,7 +48,7 @@ def solve(self, radfield_mc_estimators, time_of_simulation, volume): 4 * const.sigma_sb.cgs.value * temperature_radiative.value**4 - * (time_of_simulation) + * time_of_simulation.value * volume ) diff --git a/tardis/montecarlo/montecarlo_numba/formal_integral.py b/tardis/montecarlo/montecarlo_numba/formal_integral.py index 27aa54d283e..c49c706b373 100644 --- a/tardis/montecarlo/montecarlo_numba/formal_integral.py +++ b/tardis/montecarlo/montecarlo_numba/formal_integral.py @@ -448,7 +448,7 @@ def make_source_function(self): Edotlu = ( Edotlu_norm_factor * exptau - * montecarlo_transport_state.estimators.Edotlu_estimator + * montecarlo_transport_state.radfield_mc_estimators.Edotlu_estimator ) # The following may be achieved by calling the appropriate plasma @@ -470,7 +470,7 @@ def make_source_function(self): # Jbluelu should already by in the correct order, i.e. by wavelength of # the transition l->u Jbluelu = ( - transport.transport_state.estimators.j_blue_estimator + transport.transport_state.radfield_mc_estimators.j_blue_estimator * Jbluelu_norm_factor ) diff --git a/tardis/montecarlo/montecarlo_numba/tests/test_base.py b/tardis/montecarlo/montecarlo_numba/tests/test_base.py index 5741412b7cb..34d2d0926e2 100644 --- a/tardis/montecarlo/montecarlo_numba/tests/test_base.py +++ b/tardis/montecarlo/montecarlo_numba/tests/test_base.py @@ -62,8 +62,10 @@ def test_montecarlo_main_loop( transport_state = montecarlo_main_loop_simulation.transport.transport_state actual_energy = transport_state.packet_collection.output_energies actual_nu = transport_state.packet_collection.output_nus - actual_nu_bar_estimator = transport_state.estimators.nu_bar_estimator - actual_j_estimator = transport_state.estimators.j_estimator + actual_nu_bar_estimator = ( + transport_state.radfield_mc_estimators.nu_bar_estimator + ) + actual_j_estimator = transport_state.radfield_mc_estimators.j_estimator # Compare npt.assert_allclose( @@ -116,8 +118,8 @@ def test_montecarlo_main_loop_vpacket_log( actual_energy = transport_state.packet_collection.output_energies actual_nu = transport_state.packet_collection.output_nus - actual_nu_bar_estimator = transport_state.estimators.nu_bar_estimator - actual_j_estimator = transport_state.estimators.j_estimator + actual_nu_bar_estimator = transport_state.nu_bar_estimator + actual_j_estimator = transport_state.j_estimator actual_vpacket_log_nus = transport_state.vpacket_tracker.nus actual_vpacket_log_energies = transport_state.vpacket_tracker.energies diff --git a/tardis/montecarlo/packet_source.py b/tardis/montecarlo/packet_source.py index f531a98f59e..86d3becadbf 100644 --- a/tardis/montecarlo/packet_source.py +++ b/tardis/montecarlo/packet_source.py @@ -100,8 +100,8 @@ def create_packets(self, no_of_packets, seed_offset=0, *args, **kwargs): self.calculate_radfield_luminosity().to(u.erg / u.s).value ) return PacketCollection( - radii.cgs.value, - nus.cgs.value, + radii, + nus, mus, energies, packet_seeds, diff --git a/tardis/simulation/base.py b/tardis/simulation/base.py index 40f655824e7..72abba91498 100644 --- a/tardis/simulation/base.py +++ b/tardis/simulation/base.py @@ -369,7 +369,7 @@ def advance_state(self): # A check to see if the plasma is set with JBluesDetailed, in which # case it needs some extra kwargs. - estimators = self.transport.transport_state.estimators + estimators = self.transport.transport_state.radfield_mc_estimators if "j_blue_estimator" in self.plasma.outputs_dict: update_properties.update( t_inner=next_t_inner, diff --git a/tardis/simulation/tests/test_simulation.py b/tardis/simulation/tests/test_simulation.py index c18c7b1ebb3..2fd80c8a403 100644 --- a/tardis/simulation/tests/test_simulation.py +++ b/tardis/simulation/tests/test_simulation.py @@ -90,7 +90,8 @@ def simulation_one_loop( def test_plasma_estimates(simulation_one_loop, refdata, name): if name in ["nu_bar_estimator", "j_estimator"]: actual = getattr( - simulation_one_loop.transport.transport_state.estimators, name + simulation_one_loop.transport.transport_state.radfield_mc_estimators, + name, ) elif name in ["t_radiative", "dilution_factor"]: actual = getattr(simulation_one_loop.simulation_state, name) diff --git a/tardis/tests/test_tardis_full.py b/tardis/tests/test_tardis_full.py index 5ababcbb6bc..9909ea8a358 100644 --- a/tardis/tests/test_tardis_full.py +++ b/tardis/tests/test_tardis_full.py @@ -78,7 +78,7 @@ def test_j_blue_estimators(self, transport, refdata): j_blue_estimator = refdata("j_blue_estimator").values npt.assert_allclose( - transport.transport_state.estimators.j_blue_estimator, + transport.transport_state.radfield_mc_estimators.j_blue_estimator, j_blue_estimator, ) diff --git a/tardis/tests/test_tardis_full_formal_integral.py b/tardis/tests/test_tardis_full_formal_integral.py index 318ce1dcaa9..e45ca01bb91 100644 --- a/tardis/tests/test_tardis_full_formal_integral.py +++ b/tardis/tests/test_tardis_full_formal_integral.py @@ -79,7 +79,7 @@ def test_j_blue_estimators(self, transport, refdata): j_blue_estimator = refdata("j_blue_estimator").values npt.assert_allclose( - transport.transport_state.estimators.j_blue_estimator, + transport.transport_state.radfield_mc_estimators.j_blue_estimator, j_blue_estimator, )