From f3410356f5285b49b26d91ce32d274f6c82b7c96 Mon Sep 17 00:00:00 2001 From: Reagen Leimbach Date: Tue, 11 May 2021 18:41:02 -0400 Subject: [PATCH 1/4] uncommented if dataset == n_Bins in valid_table because now using compare_by_eye function --- Metallicity_Stack_Commons/valid_table.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Metallicity_Stack_Commons/valid_table.py b/Metallicity_Stack_Commons/valid_table.py index 12a61bf..f8013dd 100644 --- a/Metallicity_Stack_Commons/valid_table.py +++ b/Metallicity_Stack_Commons/valid_table.py @@ -131,13 +131,13 @@ def compare_to_by_eye(fitspath: str, dataset: str): (ID == 0) | (ID == 1) | (ID == 2) | (ID == 7) | (ID == 9) | (ID == 10) | (ID == 11) | (ID == 13))[0] # make_validation_table will now produce correct detection values - '''if dataset == 'n_Bins': + if dataset == 'n_Bins': det_4363 = np.where( (ID == 10) | (ID == 14) | (ID == 15) | (ID == 20) | (ID == 23) | (ID == 26))[0] rlimit = \ np.where((ID == 8) | (ID == 11) | (ID == 13)| (ID == 16) - | (ID == 17) | (ID == 19) | (ID == 22))[0]''' + | (ID == 17) | (ID == 19) | (ID == 22))[0] # Caroline: Add you conditions here From af65e6d286c6e8e3f76f97f7fd046d955a666d1f Mon Sep 17 00:00:00 2001 From: Reagen Leimbach Date: Tue, 11 May 2021 18:49:16 -0400 Subject: [PATCH 2/4] pep8 issue fixed --- Metallicity_Stack_Commons/valid_table.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Metallicity_Stack_Commons/valid_table.py b/Metallicity_Stack_Commons/valid_table.py index f8013dd..a81990a 100644 --- a/Metallicity_Stack_Commons/valid_table.py +++ b/Metallicity_Stack_Commons/valid_table.py @@ -136,8 +136,8 @@ def compare_to_by_eye(fitspath: str, dataset: str): (ID == 10) | (ID == 14) | (ID == 15) | (ID == 20) | (ID == 23) | (ID == 26))[0] rlimit = \ - np.where((ID == 8) | (ID == 11) | (ID == 13)| (ID == 16) - | (ID == 17) | (ID == 19) | (ID == 22))[0] + np.where((ID == 8) | (ID == 11) | (ID == 13) | (ID == 16) + | (ID == 17) | (ID == 19) | (ID == 22))[0] # Caroline: Add you conditions here From e17e5f4c7220f8afb25b295e1322c2f3331eb8a6 Mon Sep 17 00:00:00 2001 From: Reagen Leimbach Date: Tue, 11 May 2021 19:21:44 -0400 Subject: [PATCH 3/4] changed version in init --- Metallicity_Stack_Commons/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Metallicity_Stack_Commons/__init__.py b/Metallicity_Stack_Commons/__init__.py index a35d379..8b1c009 100644 --- a/Metallicity_Stack_Commons/__init__.py +++ b/Metallicity_Stack_Commons/__init__.py @@ -10,7 +10,7 @@ from .logging import log_stdout, log_verbose -version = "1.4.6" +version = "1.4.7" lambda0 = [3726.18, 4101.73, 4340.46, 4363.21, 4861.32, 4958.91, 5006.84] line_type = ['Oxy2', 'Balmer', 'Balmer', 'Single', 'Balmer', 'Single', 'Single'] From c6169efd4974bad11859dd55e461dc4279f11bc7 Mon Sep 17 00:00:00 2001 From: Reagen Leimbach Date: Tue, 11 May 2021 19:24:05 -0400 Subject: [PATCH 4/4] update version in setup.py --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 9639b14..03ddf2f 100644 --- a/setup.py +++ b/setup.py @@ -5,7 +5,7 @@ setup( name='Metallicity_Stack_Commons', - version='1.4.6', + version='1.4.7', packages=['Metallicity_Stack_Commons'], url='https://github.com/astrochun/Metallicity_Stack_Commons', license='MIT License',