Skip to content

Commit ea41dd3

Browse files
committed
Merge branch 'release/1.3.0' into develop
2 parents e2a8329 + 11d9d37 commit ea41dd3

4 files changed

Lines changed: 19 additions & 15 deletions

File tree

Metallicity_Stack_Commons/plotting/balmer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,9 +196,9 @@ def HbHgHd_fits(fitspath, out_pdf_prefix='HbHgHd_fits',
196196

197197
# Calculate E(B-V)
198198
EBV_HgHb = compute_EBV(Hg_fit_dict['flux_gauss']/Hb_fit_dict['flux_gauss'],
199-
source='HgHb')
199+
source='HgHb', verbose=verbose, log=log)
200200
EBV_HdHb = compute_EBV(Hd_fit_dict['flux_gauss']/Hb_fit_dict['flux_gauss'],
201-
source='HdHb')
201+
source='HdHb', verbose=verbose, log=log)
202202

203203
row = ii % n_rows
204204

README.md

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
# Metallicity_Stack_Commons
22
Set of common codes used in metallicity studies that use the stacking techniques
33

4-
[![Build Status](https://travis-ci.com/astrochun/Metallicity_Stack_Commons.svg?branch=master)](https://travis-ci.com/astrochun/Metallicity_Stack_Commons)
5-
6-
[![GitHub build](https://github.com/astrochun/Metallicity_Stack_Commons/workflows/Python%20package/badge.svg?branch=feature/gh_actions_build_test)](https://github.com/astrochun/Metallicity_Stack_Commons/actions?query=workflow%3A%22Python+package%22)
4+
[![GitHub build](https://github.com/astrochun/Metallicity_Stack_Commons/workflows/Python%20package/badge.svg?)](https://github.com/astrochun/Metallicity_Stack_Commons/actions?query=workflow%3A%22Python+package%22)
75
![GitHub top language](https://img.shields.io/github/languages/top/astrochun/Metallicity_Stack_Commons)
86
![GitHub release (latest by date)](https://img.shields.io/github/v/release/astrochun/Metallicity_Stack_Commons)
97
![GitHub](https://img.shields.io/github/license/astrochun/Metallicity_Stack_Commons?color=blue)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,5 @@
1414
description='Set of common codes used in metallicity studies that use stacking techniques',
1515
long_description=long_description,
1616
long_description_content_type="text/markdown",
17-
install_requires=['numpy', 'astropy', 'matplotlib', 'scipy', 'requests']
17+
install_requires=['numpy', 'astropy', 'matplotlib', 'scipy', 'requests', 'pytest']
1818
)

tests/test_attenuation.py

Lines changed: 15 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@ def test_compute_EBV():
2121
for offset in offsets:
2222
# Test float input
2323
Balmer = value + offset
24-
EBV = attenuation.compute_EBV(Balmer, source=source, zero_neg=zero)
24+
EBV = attenuation.compute_EBV(Balmer, source=source,
25+
zero_neg=zero, verbose=True)
2526

2627
assert isinstance(EBV, float)
2728
if offset == 0:
@@ -37,7 +38,8 @@ def test_compute_EBV():
3738

3839
# Test numpy array with single record
3940
EBV = attenuation.compute_EBV(np.array([Balmer]),
40-
source=source, zero_neg=zero)
41+
source=source, zero_neg=zero,
42+
verbose=True)
4143

4244
assert isinstance(EBV, (np.ndarray, np.generic))
4345
if offset == 0:
@@ -53,14 +55,16 @@ def test_compute_EBV():
5355

5456
# Test EBV distribution case
5557
values = [value, value - dx, value + dx]
56-
Balmer_dist = random_pdf(values, [dx] * len(values), seed_i=1, n_iter=5000)
58+
Balmer_dist = random_pdf(values, [dx] * len(values), seed_i=1,
59+
n_iter=5000)
5760
if not zero:
5861
EBV_dist = attenuation.compute_EBV(Balmer_dist, source=source,
59-
zero_neg=zero)
62+
zero_neg=zero, verbose=True)
6063
else:
6164
EBV_dist, EBV_peak = attenuation.compute_EBV(Balmer_dist,
6265
source=source,
63-
zero_neg=zero)
66+
zero_neg=zero,
67+
verbose=True)
6468

6569
'''
6670
# For writing initial file
@@ -80,7 +84,7 @@ def test_compute_EBV():
8084
def test_compute_A():
8185

8286
for EBV in [0.0, 0.25]:
83-
A_dict = attenuation.compute_A(EBV)
87+
A_dict = attenuation.compute_A(EBV, verbose=True)
8488
assert isinstance(A_dict, dict)
8589
for key in A_dict.keys():
8690
if EBV == 0:
@@ -97,7 +101,8 @@ def test_line_ratio_atten():
97101
# [OII]/H-beta
98102
ratio_atten = attenuation.line_ratio_atten(ratio, EBV,
99103
line_name_short['OII'],
100-
line_name_short['HB'])
104+
line_name_short['HB'],
105+
verbose=True)
101106
assert isinstance(ratio_atten, float)
102107
if EBV == 0:
103108
assert ratio_atten == ratio
@@ -107,7 +112,8 @@ def test_line_ratio_atten():
107112
# [OIII]/[OII]
108113
ratio_atten = attenuation.line_ratio_atten(ratio, EBV,
109114
line_name_short['OIII'],
110-
line_name_short['OII'])
115+
line_name_short['OII'],
116+
verbose=True)
111117
assert isinstance(ratio_atten, float)
112118
if EBV == 0:
113119
assert ratio_atten == ratio
@@ -117,5 +123,5 @@ def test_line_ratio_atten():
117123

118124
def test_Hb_SFR():
119125

120-
logSFR = attenuation.Hb_SFR(41.0, 0.25)
126+
logSFR = attenuation.Hb_SFR(41.0, 0.25, verbose=True)
121127
assert isinstance(logSFR, float)

0 commit comments

Comments
 (0)