From e867ad80bd161bfd4ac49ed815388c9d86dedf49 Mon Sep 17 00:00:00 2001 From: Dhruv Sondhi Date: Fri, 14 Jan 2022 14:38:12 +0530 Subject: [PATCH 1/3] Renamed RPacketCollection Class to RPacketTracker, Changed relevant variables names to refect this change --- tardis/montecarlo/base.py | 2 +- tardis/montecarlo/montecarlo_numba/base.py | 20 +++++++++---------- .../montecarlo_numba/numba_interface.py | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tardis/montecarlo/base.py b/tardis/montecarlo/base.py index da7d9c725f0..f1d7f1e31ae 100644 --- a/tardis/montecarlo/base.py +++ b/tardis/montecarlo/base.py @@ -135,7 +135,7 @@ def __init__( self.virt_packet_initial_rs = np.ones(2) * -1.0 self.virt_packet_initial_mus = np.ones(2) * -1.0 - # Setting up the Tracking array for RPacketCollection + # Setting up the Tracking array for TrackedRPacketCollection self.rpacket_tracker = None # set up logger based on config diff --git a/tardis/montecarlo/montecarlo_numba/base.py b/tardis/montecarlo/montecarlo_numba/base.py index 56b1ebbee6a..50887b0adf8 100644 --- a/tardis/montecarlo/montecarlo_numba/base.py +++ b/tardis/montecarlo/montecarlo_numba/base.py @@ -11,7 +11,7 @@ from tardis.montecarlo.montecarlo_numba.numba_interface import ( PacketCollection, VPacketCollection, - RPacketCollection, + RPacketTracker, NumbaModel, numba_plasma_initialize, Estimators, @@ -78,7 +78,7 @@ def montecarlo_radial1d( virt_packet_last_interaction_type, virt_packet_last_line_interaction_in_id, virt_packet_last_line_interaction_out_id, - tracked_rpackets, + tracked_rpackets_collection, ) = montecarlo_main_loop( packet_collection, numba_model, @@ -129,7 +129,7 @@ def montecarlo_radial1d( # Condition for Checking if RPacket Tracking is enabled if montecarlo_configuration.RPACKET_TRACKING: - runner.rpacket_tracker = tracked_rpackets + runner.rpacket_tracker = tracked_rpackets_collection @njit(**njit_dict) @@ -196,9 +196,9 @@ def montecarlo_main_loop( ) # Configuring the Tracking for R_Packets - tracked_rpackets = List() + tracked_rpackets_collection = List() for i in range(len(output_nus)): - tracked_rpackets.append(RPacketCollection()) + tracked_rpackets_collection.append(RPacketTracker()) # Arrays for vpacket logging virt_packet_nus = [] @@ -236,7 +236,7 @@ def montecarlo_main_loop( i, ) vpacket_collection = vpacket_collections[i] - rpacket_collection = tracked_rpackets[i] + tracked_rpacket = tracked_rpackets_collection[i] single_packet_loop( r_packet, @@ -244,7 +244,7 @@ def montecarlo_main_loop( numba_plasma, estimators, vpacket_collection, - rpacket_collection, + tracked_rpacket, ) output_nus[i] = r_packet.nu @@ -331,8 +331,8 @@ def montecarlo_main_loop( ) if montecarlo_configuration.RPACKET_TRACKING: - for rpacket_collection in tracked_rpackets: - rpacket_collection.finalize_array() + for tracked_rpacket in tracked_rpackets_collection: + tracked_rpacket.finalize_array() packet_collection.packets_output_energy[:] = output_energies[:] packet_collection.packets_output_nu[:] = output_nus[:] @@ -351,5 +351,5 @@ def montecarlo_main_loop( virt_packet_last_interaction_type, virt_packet_last_line_interaction_in_id, virt_packet_last_line_interaction_out_id, - tracked_rpackets, + tracked_rpackets_collection, ) diff --git a/tardis/montecarlo/montecarlo_numba/numba_interface.py b/tardis/montecarlo/montecarlo_numba/numba_interface.py index cf3ceb5ab3b..23500fab8b9 100644 --- a/tardis/montecarlo/montecarlo_numba/numba_interface.py +++ b/tardis/montecarlo/montecarlo_numba/numba_interface.py @@ -320,7 +320,7 @@ def set_properties( @jitclass(rpacket_collection_spec) -class RPacketCollection(object): +class RPacketTracker(object): """ Numba JITCLASS for storing the information for each interaction a RPacket instance undergoes. From 5a5d200101751efb8061cf5dc353fac3e9e76622 Mon Sep 17 00:00:00 2001 From: Dhruv Sondhi Date: Fri, 14 Jan 2022 15:30:50 +0530 Subject: [PATCH 2/3] Addressed requested changes on review --- tardis/montecarlo/base.py | 2 +- tardis/montecarlo/montecarlo_numba/base.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tardis/montecarlo/base.py b/tardis/montecarlo/base.py index f1d7f1e31ae..ed0bc3b7a5f 100644 --- a/tardis/montecarlo/base.py +++ b/tardis/montecarlo/base.py @@ -135,7 +135,7 @@ def __init__( self.virt_packet_initial_rs = np.ones(2) * -1.0 self.virt_packet_initial_mus = np.ones(2) * -1.0 - # Setting up the Tracking array for TrackedRPacketCollection + # Setting up the Tracking array for storing all the RPacketTracker instances self.rpacket_tracker = None # set up logger based on config diff --git a/tardis/montecarlo/montecarlo_numba/base.py b/tardis/montecarlo/montecarlo_numba/base.py index 50887b0adf8..f07d6fc057f 100644 --- a/tardis/montecarlo/montecarlo_numba/base.py +++ b/tardis/montecarlo/montecarlo_numba/base.py @@ -78,7 +78,7 @@ def montecarlo_radial1d( virt_packet_last_interaction_type, virt_packet_last_line_interaction_in_id, virt_packet_last_line_interaction_out_id, - tracked_rpackets_collection, + rpacket_trackers, ) = montecarlo_main_loop( packet_collection, numba_model, @@ -129,7 +129,7 @@ def montecarlo_radial1d( # Condition for Checking if RPacket Tracking is enabled if montecarlo_configuration.RPACKET_TRACKING: - runner.rpacket_tracker = tracked_rpackets_collection + runner.rpacket_tracker = rpacket_trackers @njit(**njit_dict) @@ -196,9 +196,9 @@ def montecarlo_main_loop( ) # Configuring the Tracking for R_Packets - tracked_rpackets_collection = List() + rpacket_trackers = List() for i in range(len(output_nus)): - tracked_rpackets_collection.append(RPacketTracker()) + rpacket_trackers.append(RPacketTracker()) # Arrays for vpacket logging virt_packet_nus = [] @@ -236,7 +236,7 @@ def montecarlo_main_loop( i, ) vpacket_collection = vpacket_collections[i] - tracked_rpacket = tracked_rpackets_collection[i] + tracked_rpacket = rpacket_trackers[i] single_packet_loop( r_packet, @@ -331,8 +331,8 @@ def montecarlo_main_loop( ) if montecarlo_configuration.RPACKET_TRACKING: - for tracked_rpacket in tracked_rpackets_collection: - tracked_rpacket.finalize_array() + for rpacket_tracker in rpacket_trackers: + rpacket_tracker.finalize_array() packet_collection.packets_output_energy[:] = output_energies[:] packet_collection.packets_output_nu[:] = output_nus[:] @@ -351,5 +351,5 @@ def montecarlo_main_loop( virt_packet_last_interaction_type, virt_packet_last_line_interaction_in_id, virt_packet_last_line_interaction_out_id, - tracked_rpackets_collection, + rpacket_trackers, ) From c8a151d8e2222dc5f2f3baab14191e9d16955e46 Mon Sep 17 00:00:00 2001 From: Dhruv Sondhi Date: Fri, 14 Jan 2022 21:18:34 +0530 Subject: [PATCH 3/3] Fixed failing test because of wrong import --- tardis/montecarlo/tests/test_montecarlo.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tardis/montecarlo/tests/test_montecarlo.py b/tardis/montecarlo/tests/test_montecarlo.py index f63dd08b2d6..712b022955c 100644 --- a/tardis/montecarlo/tests/test_montecarlo.py +++ b/tardis/montecarlo/tests/test_montecarlo.py @@ -53,8 +53,8 @@ import tardis.montecarlo.montecarlo_numba.utils as utils import tardis.montecarlo.montecarlo_configuration as mc from tardis import constants as const -from tardis.montecarlo.montecarlo_numba.numba_interface import Estimators -from tardis.montecarlo.montecarlo_numba.numba_interface import RPacketCollection +from tardis.montecarlo.montecarlo_numba.numba_interface import Estimators, RPacketTracker +from tardis.montecarlo.montecarlo_numba.numba_interface import RPacketTracker from tardis.montecarlo.montecarlo_numba import macro_atom from tardis.montecarlo.montecarlo_numba.frame_transformations import ( @@ -839,7 +839,7 @@ def test_rpacket_tracking(index, seed, r, nu, mu, energy): # Setup Montecarlo_Configuration.INITIAL_TRACKING_ARRAY_LENGTH mc.INITIAL_TRACKING_ARRAY_LENGTH = 10 - tracked_rpacket_properties = RPacketCollection() + tracked_rpacket_properties = RPacketTracker() test_rpacket = r_packet.RPacket( index=index, seed=seed,