diff --git a/tardis/montecarlo/montecarlo_numba/base.py b/tardis/montecarlo/montecarlo_numba/base.py index 312fa5ecaac..00d03087003 100644 --- a/tardis/montecarlo/montecarlo_numba/base.py +++ b/tardis/montecarlo/montecarlo_numba/base.py @@ -375,7 +375,7 @@ def create_tracked_rpacket_df(track_dict_list, rpacket_trackers, iteration): Parameters ---------- - rpacket_collections : list (contains `numba.jitclass` instances) + rpacket_trackers : list (contains `numba.jitclass` instances) A list of rpackets. Stores all the data for each interaction a particular rpacket undergoes as the simulation progresses. iteration : int Current Simulation 'Iteration' value diff --git a/tardis/montecarlo/montecarlo_numba/numba_interface.py b/tardis/montecarlo/montecarlo_numba/numba_interface.py index 23500fab8b9..5495fad08f1 100644 --- a/tardis/montecarlo/montecarlo_numba/numba_interface.py +++ b/tardis/montecarlo/montecarlo_numba/numba_interface.py @@ -305,7 +305,7 @@ def set_properties( self.idx += 1 -rpacket_collection_spec = [ +rpacket_tracker_spec = [ ("length", int64), ("seed", int64[:]), ("index", int64[:]), @@ -319,7 +319,7 @@ def set_properties( ] -@jitclass(rpacket_collection_spec) +@jitclass(rpacket_tracker_spec) class RPacketTracker(object): """ Numba JITCLASS for storing the information for each interaction a RPacket instance undergoes. diff --git a/tardis/montecarlo/montecarlo_numba/single_packet_loop.py b/tardis/montecarlo/montecarlo_numba/single_packet_loop.py index 3cced140f37..3d847492e3f 100644 --- a/tardis/montecarlo/montecarlo_numba/single_packet_loop.py +++ b/tardis/montecarlo/montecarlo_numba/single_packet_loop.py @@ -41,7 +41,7 @@ def single_packet_loop( numba_plasma, estimators, vpacket_collection, - rpacket_collection, + tracked_rpacket, ): """ Parameters @@ -51,7 +51,7 @@ def single_packet_loop( numba_plasma : tardis.montecarlo.montecarlo_numba.numba_interface.NumbaPlasma estimators : tardis.montecarlo.montecarlo_numba.numba_interface.Estimators vpacket_collection : tardis.montecarlo.montecarlo_numba.numba_interface.VPacketCollection - rpacket_collection : tardis.montecarlo.montecarlo_numba.numba_interface.RPacketCollection + tracked_rpacket : tardis.montecarlo.montecarlo_numba.numba_interface.RPacketCollection Returns ------- @@ -73,7 +73,7 @@ def single_packet_loop( ) if montecarlo_configuration.RPACKET_TRACKING: - rpacket_collection.track(r_packet) + tracked_rpacket.track(r_packet) while r_packet.status == PacketStatus.IN_PROCESS: distance, interaction_type, delta_shell = trace_packet( @@ -117,7 +117,7 @@ def single_packet_loop( ) if montecarlo_configuration.RPACKET_TRACKING: - rpacket_collection.track(r_packet) + tracked_rpacket.track(r_packet) # check where else initialize line ID happens!