Merge branch 'feature/constants' into develop (PR #9)

astrochun · Jan 31, 2020 · 11527c4 · 11527c4
2 parents a8109f3 + 875c91c
commit 11527c4
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Metallicity_Stack_Commons/__init__.py b/Metallicity_Stack_Commons/__init__.py
@@ -3,6 +3,7 @@
 from datetime import date
 import os
 import getpass
+import numpy as np
 
 version = "0.1.0"
 
@@ -22,6 +23,9 @@
 
 scalefact = 1e-17
 
+# Flux ratio of [OIII]5007 to [OIII]4959
+OIII_r = 3.1
+
 # Define k values for dust attenuation
 k_values = cardelli(lambda0 * u.Angstrom)
 k_dict   = dict(zip(line_name,k_values))
@@ -42,7 +46,7 @@ def exclude_outliers(objno):
     flag = np.zeros(len(objno), dtype=int)
     bad_data = np.array(['32007727', '32101412', '42006031', '32035286', '14023705'])
     for ii in range(len(bad_data)):
-        idx = [xx for xx in range(len(objno)) if bad_data[ii] == str(objno[xx])][0]
+        idx = [xx for xx in range(len(objno)) if bad_data[ii] == str(objno[xx])]
         flag[idx] = 1
 
     return flag
@@ -76,7 +80,7 @@ def dir_date(org_name, path_init='', year=False):
 
     list_path = [path_init, org_name, "%02i%02i" % (today.month, today.day), '']
     if year:
-        list_path[-2] += "i%02i%02i" % today.year
+        list_path[-2] += "%02i" % today.year
 
     fitspath = os.path.join(*list_path)
     try: