@@ -29,7 +29,7 @@ def test_convert_to_banded():
29
29
30
30
31
31
def test_calc_spectral_factor ():
32
- # TODO: @Anton, review atol values in all assert_allclose calls (6 total)
32
+
33
33
# make three test spectra
34
34
bi0 = np .array (BANDED_AM15G )
35
35
bi1 = bi0 * np .linspace (1.1 , 0.5 , 29 ) # blue enhanced
@@ -40,34 +40,34 @@ def test_calc_spectral_factor():
40
40
# flat SR beyond limits
41
41
sr = pd .Series ([1.0 , 1.0 ], [200 , 5000 ])
42
42
bsr = convert_to_banded (sr )
43
- smm = calc_spectral_factor (bi , bsr )
44
- assert_allclose (smm , [1 , 1 , 1 ], atol = 1e-2 )
43
+ smm = calc_spectral_factor (bi , bsr , integration_limit = 28 )
44
+ assert_allclose (smm , [1 , 1 , 1 ])
45
45
46
46
# flat SR exactly to limits
47
47
sr = pd .Series ([1.0 , 1.0 ],
48
48
[SPECTRAL_BAND_EDGES [0 ], SPECTRAL_BAND_EDGES [- 2 ]])
49
49
bsr = convert_to_banded (sr )
50
- smm = calc_spectral_factor (bi , bsr )
51
- assert_allclose (smm , [1 , 1 , 1 ], atol = 1e-2 )
50
+ smm = calc_spectral_factor (bi , bsr , integration_limit = 28 )
51
+ assert_allclose (smm , [1 , 1 , 1 ])
52
52
53
53
# flat SR in Si range
54
54
sr = pd .Series ([1.0 , 1.0 ], [300 , 1200 ])
55
55
bsr = convert_to_banded (sr )
56
- smm = calc_spectral_factor (bi , bsr )
57
- assert_allclose (smm , [1. , 1.04744717 , 0.94786063 ], atol = 1e-2 )
56
+ smm = calc_spectral_factor (bi , bsr , integration_limit = 28 )
57
+ assert_allclose (smm , [1. , 1.04744717 , 0.94786063 ])
58
58
59
59
# sawtooth SR in Si range
60
60
sr = pd .Series ([0.1 , 1.0 , 0.0 ], [300 , 1000 , 1200 ])
61
61
bsr = convert_to_banded (sr )
62
- smm = calc_spectral_factor (bi , bsr )
63
- assert_allclose (smm , [1. , 1.00059311 , 0.99934824 ], atol = 1e-2 )
62
+ smm = calc_spectral_factor (bi , bsr , integration_limit = 28 )
63
+ assert_allclose (smm , [1. , 1.00059311 , 0.99934824 ])
64
64
65
65
# scaling doesn't make a difference
66
- smm = calc_spectral_factor (bi , bsr * 3 )
67
- assert_allclose (smm , [1. , 1.00059311 , 0.99934824 ], atol = 1e-2 )
66
+ smm = calc_spectral_factor (bi , bsr * 3 , integration_limit = 28 )
67
+ assert_allclose (smm , [1. , 1.00059311 , 0.99934824 ])
68
68
69
- smm = calc_spectral_factor (bi * 2 , bsr )
70
- assert_allclose (smm , [1. , 1.00059311 , 0.99934824 ], atol = 1e-2 )
69
+ smm = calc_spectral_factor (bi * 2 , bsr , integration_limit = 28 )
70
+ assert_allclose (smm , [1. , 1.00059311 , 0.99934824 ])
71
71
72
72
73
73
def test_BilinearInterpolator ():
0 commit comments