From a9aa6e44af2a5eb6fee566483b59df79d56e95e7 Mon Sep 17 00:00:00 2001 From: gonzaponte Date: Fri, 22 Nov 2019 19:51:11 +0200 Subject: [PATCH] Refactor test --- .../reco/monitor_functions_test.py | 27 +++++-------------- 1 file changed, 7 insertions(+), 20 deletions(-) diff --git a/invisible_cities/reco/monitor_functions_test.py b/invisible_cities/reco/monitor_functions_test.py index e7985338ef..8de6048fc4 100644 --- a/invisible_cities/reco/monitor_functions_test.py +++ b/invisible_cities/reco/monitor_functions_test.py @@ -284,26 +284,13 @@ def test_rwf_bins(): out_bins, out_labels, out_baseline = monf.rwf_bins(test_dict) - bins = test_dict['PMT_Baseline_bins'] - assert np.allclose(out_bins['PMT_Baseline'] , [np.linspace(bins[0], bins[1], bins[2] + 1)]) - bins = test_dict['PMT_BaselineRMS_bins'] - assert np.allclose(out_bins['PMT_BaselineRMS'] , [np.linspace(bins[0], bins[1], bins[2] + 1)]) - bins = test_dict['PMT_nSensors_bins'] - assert np.allclose(out_bins['PMT_nSensors'] , [np.linspace(bins[0], bins[1], bins[2] + 1)]) - bins = test_dict['SiPM_Baseline_bins'] - assert np.allclose(out_bins['SiPM_Baseline'] , [np.linspace(bins[0], bins[1], bins[2] + 1)]) - bins = test_dict['SiPM_BaselineRMS_bins'] - assert np.allclose(out_bins['SiPM_BaselineRMS'], [np.linspace(bins[0], bins[1], bins[2] + 1)]) - bins = test_dict['SiPM_nSensors_bins'] - assert np.allclose(out_bins['SiPM_nSensors'] , [np.linspace(bins[0], bins[1], bins[2] + 1)]) - - assert out_labels['PMT_Baseline'] [0] == test_dict['PMT_Baseline_labels'] [0] - assert out_labels['PMT_BaselineRMS'] [0] == test_dict['PMT_BaselineRMS_labels'] [0] - assert out_labels['PMT_nSensors'] [0] == test_dict['PMT_nSensors_labels'] [0] - assert out_labels['SiPM_Baseline'] [0] == test_dict['SiPM_Baseline_labels'] [0] - assert out_labels['SiPM_BaselineRMS'][0] == test_dict['SiPM_BaselineRMS_labels'][0] - assert out_labels['SiPM_nSensors'] [0] == test_dict['SiPM_nSensors_labels'] [0] - assert out_baseline == test_dict['n_baseline'] + for name in ( 'PMT_Baseline', 'PMT_BaselineRMS', 'PMT_nSensors', + 'SiPM_Baseline', 'SiPM_BaselineRMS', 'SiPM_nSensors'): + bins = test_dict[f'{name}_bins'] + assert np.allclose(out_bins[name], [np.linspace(bins[0], bins[1], bins[2] + 1)]) + assert out_labels[name][0] == test_dict[f'{name}_labels'][0] + + assert out_baseline == test_dict['n_baseline'] def test_fill_rwf_histos(ICDATADIR):