Merge branch 'release/1.2.0' into develop

Author: astrochun

Metallicity_Stack_Commons/__init__.py

@@ -5,7 +5,7 @@
 import getpass
 import numpy as np
 
-version = "1.1.6"
+version = "1.2.0"
 
 lambda0   = [3726.18, 4101.73, 4340.46, 4363.21, 4861.32, 4958.91, 5006.84]
 line_type = ['Oxy2', 'Balmer', 'Balmer', 'Single', 'Balmer', 'Single', 'Single']

Metallicity_Stack_Commons/analysis/attenuation.py

@@ -65,7 +65,7 @@ def compute_EBV(ratio, source='HgHb', zero_neg=True):
                 neg_idx = np.where(EBV_peak < 0.0)[0]
                 if len(neg_idx) > 0:
                     print('EBV distribution shifted for peak')
-                    EBV[neg_idx, :] -= EBV_peak[neg_idx]
+                    EBV[neg_idx, :] -= EBV_peak[neg_idx].reshape((len(neg_idx), 1))
                     EBV_peak[neg_idx] = 0.0
                 return EBV, EBV_peak
     else:

Metallicity_Stack_Commons/plotting/balmer.py

@@ -136,7 +136,7 @@ def HbHgHd_fits(fitspath, out_pdf_prefix='HbHgHd_fits',
         astropy_table_file = join(fitspath, filename_dict['bin_fit'])
         out_pdf = join(fitspath, out_pdf_prefix+'.pdf')
     else:
-        astropy_table_file = join(fitspath, filename_dict['bin_fit_rev'])
+        astropy_table_file = join(fitspath, filename_dict['bin_fit_MC'])
         out_pdf = join(fitspath, out_pdf_prefix+'.MC.pdf')
 
     astropy_table = asc.read(astropy_table_file)

Metallicity_Stack_Commons/update_det4363_info.py

@@ -1,5 +1,4 @@
 from chun_codes import match_nosort
-from astropy.io import fits
 
 
 def get_index(det4363_table, input_table, column_name):

README.md

@@ -1,7 +1,7 @@
 # Metallicity_Stack_Commons
 Set of common codes used in metallicity studies that use the stacking techniques
 
-[![Build Status](https://travis-ci.com/astrochun/Metallicity_Stack_Commons.svg?branch=feature/travis_ci)](https://travis-ci.com/astrochun/Metallicity_Stack_Commons)
+[![Build Status](https://travis-ci.com/astrochun/Metallicity_Stack_Commons.svg?branch=master)](https://travis-ci.com/astrochun/Metallicity_Stack_Commons)
 ![GitHub top language](https://img.shields.io/github/languages/top/astrochun/Metallicity_Stack_Commons)
 ![GitHub release (latest by date)](https://img.shields.io/github/v/release/astrochun/Metallicity_Stack_Commons)
 ![GitHub](https://img.shields.io/github/license/astrochun/Metallicity_Stack_Commons?color=blue)

setup.py

@@ -5,7 +5,7 @@
 
 setup(
     name='Metallicity_Stack_Commons',
-    version='1.1.6',
+    version='1.2.0',
     packages=['Metallicity_Stack_Commons'],
     url='https://github.com/astrochun/Metallicity_Stack_Commons',
     license='MIT License',

tests/test_attenuation.py

@@ -54,7 +54,14 @@ def test_compute_EBV():
             # Test EBV distribution case
             values = [value, value - dx, value + dx]
             Balmer_dist = random_pdf(values, [dx] * len(values), seed_i=1, n_iter=5000)
-            EBV_dist = attenuation.compute_EBV(Balmer_dist, source=source, zero_neg=zero)
+            if not zero:
+                EBV_dist = attenuation.compute_EBV(Balmer_dist, source=source,
+                                                   zero_neg=zero)
+            else:
+                EBV_dist, EBV_peak = attenuation.compute_EBV(Balmer_dist,
+                                                             source=source,
+                                                             zero_neg=zero)
+
             '''
             # For writing initial file
             npz_outfile = join('tests_data', f'EBV_dist_{source}_{zero}.npz')

tests/test_commons.py

@@ -89,7 +89,7 @@ def test_column_names():
     assert len(column_names.filename_dict.keys()) == 17
 
     assert isinstance(column_names.npz_filename_dict, dict)
-    assert len(column_names.npz_filename_dict.keys()) == 6
+    assert len(column_names.npz_filename_dict.keys()) == 18
 
     column_merge = column_names.merge_column_names(['AAA'], ['BBB'])
     assert isinstance(column_merge, list)