diff --git a/tests/integration/drtsans/mono/gpsans/test_simulated_events.py b/tests/integration/drtsans/mono/gpsans/test_simulated_events.py index a09ae80d..8762161b 100644 --- a/tests/integration/drtsans/mono/gpsans/test_simulated_events.py +++ b/tests/integration/drtsans/mono/gpsans/test_simulated_events.py @@ -390,8 +390,8 @@ def _mock_LoadEventNexus(*_, **kwargs): @pytest.mark.parametrize( "ID, timeSliceInterval", [ - ("integerNperiods", 1.0 / 60), - ("nonIntegerNperiods", 2.0 / 60), + ("integerNslices", 1.0 / 60), # period is a multiple of time slice interval + ("nonIntegerNslices", 2.0 / 60), # ... or it is not ], ) def test_split_three_rings(three_rings_pattern: dict, temp_directory: Callable[[Any], str], ID, timeSliceInterval): @@ -453,14 +453,14 @@ def _mock_monitor_split_and_log( minimum_peak_intensity = 800.0 # all three peaks have a maximum intensity bigger than this number # check peaks were detected - if ID == "integerNperiods": + if ID == "integerNslices": # find the Q-modulus where the scattering intensity is maximum, and compare to what's expected for peak_index, q_at_max_i in enumerate(metadata["Q_at_max_I"]): i_vs_qmod: IQmod = reduction_output[peak_index].I1D_main[0] # 1D intensity profile closest_index = np.argmin(np.abs(i_vs_qmod.mod_q - q_at_max_i)) assert i_vs_qmod.intensity[closest_index] > minimum_peak_intensity - elif ID == "nonIntegerNperiods": + elif ID == "nonIntegerNslices": # 2 time slices, there will be 2 peaks in the first i_vs_qmod: IQmod = reduction_output[0].I1D_main[0] # 1D intensity profile diff --git a/tests/integration/drtsans/tof/eqsans/test_simulated_events.py b/tests/integration/drtsans/tof/eqsans/test_simulated_events.py index b5bb1110..75ae2ce9 100644 --- a/tests/integration/drtsans/tof/eqsans/test_simulated_events.py +++ b/tests/integration/drtsans/tof/eqsans/test_simulated_events.py @@ -847,8 +847,8 @@ def _mock_eqsans_load_and_split(*args, **kwargs): @pytest.mark.parametrize( "ID, timeSliceInterval", [ - ("integerNperiods", 1.0 / 60), - ("nonIntegerNperiods", 2.0 / 60), + ("integerNslices", 1.0 / 60), # period is a multiple of time slice interval + ("nonIntegerNslices", 2.0 / 60), # ... or it is not ], ) def test_split_three_rings(three_rings_pattern: dict, temp_directory: Callable[[Any], str], ID, timeSliceInterval): @@ -937,17 +937,18 @@ def _mock_transform_to_wavelength(*args, **kwargs): # do the actual reduction reduction_output = reduce_single_configuration(loaded, config) - minimum_peak_intensity = 300 # all three peaks have a maximum intensity bigger than this number - # check peaks were detected - if ID == "integerNperiods": + + if ID == "integerNslices": + minimum_peak_intensity = 300 # all three peaks have a maximum intensity bigger than this number # find the Q-modulus where the scattering intensity is maximum, and compare to what's expected for peak_index, q_at_max_i in enumerate(metadata["Q_at_max_I"]): i_vs_qmod: IQmod = reduction_output[peak_index].I1D_main[0] # 1D intensity profile closest_index = np.argmin(np.abs(i_vs_qmod.mod_q - q_at_max_i)) assert i_vs_qmod.intensity[closest_index] > minimum_peak_intensity - elif ID == "nonIntegerNperiods": + elif ID == "nonIntegerNslices": + minimum_peak_intensity = 199 # 2 time slices, there will be 2 peaks in the first i_vs_qmod: IQmod = reduction_output[0].I1D_main[0] # 1D intensity profile