diff --git a/tardis/montecarlo/struct.py b/tardis/montecarlo/struct.py index bc2946ea1bb..69e130c5469 100644 --- a/tardis/montecarlo/struct.py +++ b/tardis/montecarlo/struct.py @@ -13,7 +13,6 @@ class RPacket(Structure): ('next_line_id', c_int64), ('last_line', c_int64), ('close_line', c_int64), - ('recently_crossed_boundary', c_int64), ('current_continuum_id', c_int64), ('virtual_packet_flag', c_int64), ('virtual_packet', c_int64), diff --git a/tardis/montecarlo/tests/test_cmontecarlo.py b/tardis/montecarlo/tests/test_cmontecarlo.py index 3f6e1198ad2..15067aec213 100644 --- a/tardis/montecarlo/tests/test_cmontecarlo.py +++ b/tardis/montecarlo/tests/test_cmontecarlo.py @@ -26,7 +26,6 @@ def packet(): 'next_line_id': 1, 'last_line': 0, 'close_line': 0, - 'recently_crossed_boundary': 1, 'current_continuum_id': 1, 'virtual_packet_flag': 1, 'virtual_packet': 0, @@ -128,22 +127,18 @@ def test_rpacket_doppler_factor(packet_params, model_params, expected, packet, m @pytest.mark.parametrize( ['packet_params', 'expected_params'], - [({'mu': 0.3, 'r': 7.5e14, 'recently_crossed_boundary': 1}, + [({'mu': 0.3, 'r': 7.5e14}, {'d_boundary': 259376919351035.88}), - ({'mu': 0.3, 'r': 7.5e14, 'recently_crossed_boundary': 0}, - {'d_boundary': 259376919351035.88}), - - ({'mu': -.3, 'r': 7.5e13, 'recently_crossed_boundary': 0}, + ({'mu': -.3, 'r': 7.5e13}, {'d_boundary': -664987228972291.5}), - ({'mu': -.3, 'r': 7.5e14, 'recently_crossed_boundary': 0}, + ({'mu': -.3, 'r': 7.5e14}, {'d_boundary': 709376919351035.9})] ) def test_compute_distance2boundary(packet_params, expected_params, packet, model): packet.mu = packet_params['mu'] packet.r = packet_params['r'] - packet.recently_crossed_boundary = packet_params['recently_crossed_boundary'] cmontecarlo_methods.compute_distance2boundary(byref(packet), byref(model))