Merge branch 'release/0.8.0' (PR #45)

astrochun · Apr 12, 2020 · cf4ef16 · cf4ef16
2 parents 466e62b + fdac148
commit cf4ef16
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 9 deletions.
diff --git a/Metallicity_Stack_Commons/attenuation.py → ...ity_Stack_Commons/analysis/attenuation.py b/Metallicity_Stack_Commons/attenuation.py → ...ity_Stack_Commons/analysis/attenuation.py
@@ -2,7 +2,7 @@
 from astropy.table import Table
 import numpy as np
 
-from . import k_dict
+from .. import k_dict
 
 HgHb_CaseB = 0.468 # Hg/Hb ratio for zero reddening
 

diff --git a/Metallicity_Stack_Commons/analysis/composite_indv_detect.py b/Metallicity_Stack_Commons/analysis/composite_indv_detect.py
@@ -5,7 +5,7 @@
 from astropy.io import ascii as asc
 from astropy.table import Table
 
-from ..temp_metallicity_calc import metallicity_calculation
+from .temp_metallicity_calc import metallicity_calculation
 from .. import OIII_r
 from ..column_names import bin_names0, indv_names0, temp_metal_names0
 from ..column_names import filename_dict

diff --git a/Metallicity_Stack_Commons/error_prop.py → ...city_Stack_Commons/analysis/error_prop.py b/Metallicity_Stack_Commons/error_prop.py → ...city_Stack_Commons/analysis/error_prop.py
@@ -1,11 +1,11 @@
 from os.path import join, exists
 
 from chun_codes import random_pdf, compute_onesig_pdf
-from . import line_name
+from .. import line_name
 from astropy.io import ascii as asc
 import numpy as np
 
-from .column_names import filename_dict, temp_metal_names0, npz_filename_dict
+from ..column_names import filename_dict, temp_metal_names0, npz_filename_dict
 from .ratios import error_prop_flux_ratios
 from .temp_metallicity_calc import temp_calculation, metallicity_calculation
 

diff --git a/Metallicity_Stack_Commons/fitting.py → ...llicity_Stack_Commons/analysis/fitting.py b/Metallicity_Stack_Commons/fitting.py → ...llicity_Stack_Commons/analysis/fitting.py
@@ -2,7 +2,7 @@
 from astropy.convolution import Box1DKernel, convolve
 from astropy.io import ascii as asc
 
-from . import scalefact, wavelength_dict
+from .. import scalefact, wavelength_dict
 
 con1 = wavelength_dict['OII_3729'] / wavelength_dict['OII_3726'] # Ratio of OII doublet line
 

diff --git a/Metallicity_Stack_Commons/ratios.py → Metallicity_Stack_Commons/analysis/ratios.py b/Metallicity_Stack_Commons/ratios.py → Metallicity_Stack_Commons/analysis/ratios.py
@@ -1,6 +1,6 @@
 import numpy as np
 
-from . import line_name_short, OIII_r
+from .. import line_name_short, OIII_r
 from .temp_metallicity_calc import R_calculation
 
 

diff --git a/...ty_Stack_Commons/temp_metallicity_calc.py → ...Commons/analysis/temp_metallicity_calc.py b/...ty_Stack_Commons/temp_metallicity_calc.py → ...Commons/analysis/temp_metallicity_calc.py
@@ -1,8 +1,8 @@
 import numpy as np
 
-from . import k_dict
+from .. import k_dict
 
-from .column_names import temp_metal_names0, remove_from_list
+from ..column_names import temp_metal_names0, remove_from_list
 
 k_4363 = k_dict['OIII_4363']
 k_5007 = k_dict['OIII_5007']

diff --git a/Metallicity_Stack_Commons/plotting/balmer.py b/Metallicity_Stack_Commons/plotting/balmer.py
@@ -14,7 +14,7 @@
 from astropy.io import ascii as asc
 from matplotlib.backends.backend_pdf import PdfPages
 
-from ..fitting import gauss, double_gauss
+from ..analysis.fitting import gauss, double_gauss
 
 from .. import scalefact, wavelength_dict