From 57ae3535aa8ff0d4e5f61899cf568eb5a9319c0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Galbany?= Date: Wed, 8 Feb 2023 09:57:04 +0100 Subject: [PATCH 1/3] Update requirements.txt changed numpy to 1.23.5 because 1.24 failed --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8bc9e11..748f2cc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy >= 1.16 +numpy >= 1.23.5 scipy >= 1.5.4 astropy == 5.0.4 photutils == 1.1.0 @@ -18,4 +18,4 @@ sep astroalign > 2.3 networkx astroquery >= 0.4.2 -tendrils >= 0.1.5 \ No newline at end of file +tendrils >= 0.1.5 From 722f62e508b15167f0b584ffad672e3822e310d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Galbany?= Date: Wed, 8 Feb 2023 09:57:13 +0100 Subject: [PATCH 2/3] Update requirements.txt --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 748f2cc..bfa5c83 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy >= 1.23.5 +numpy == 1.23.5 scipy >= 1.5.4 astropy == 5.0.4 photutils == 1.1.0 From 6af9c7937ee87fc795d48020e2ab5f01f1451804 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Galbany?= Date: Wed, 8 Feb 2023 10:22:30 +0100 Subject: [PATCH 3/3] add TNG --- flows/instruments/instruments.py | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/flows/instruments/instruments.py b/flows/instruments/instruments.py index ec5f611..f162188 100644 --- a/flows/instruments/instruments.py +++ b/flows/instruments/instruments.py @@ -542,15 +542,6 @@ def get_photfilter(self): raise ValueError(f"Could not find filter {filt} in {[f for f in FILTERS.keys()]}") -INSTRUMENTS = inspect.getmembers(sys.modules[__name__], - lambda member: inspect.isclass(member) and member.__module__ == __name__) - -# instruments = {'LCOGT': LCOGT, 'HAWKI': HAWKI, 'ALFOSC': ALFOSC, 'NOTCAM': NOTCAM, 'PS1': PS1, 'Liverpool': Liverpool, -# 'Omega2000': Omega2000, 'Swope': Swope, 'Swope_newheader':Swope_newheader, 'Dupont': Dupont, 'Retrocam': -# RetroCam, 'Baade': Baade, -# 'Sofi': Sofi, 'EFOSC': EFOSC, 'AstroNIRCam': AstroNIRCam, 'OmegaCam': OmegaCam, 'AndiCam': AndiCam, -# 'PairTel': PairTel, 'TJO_Meia2': TJO_MEIA2, 'TJO_Meia3': TJO_MEIA3, 'RATIR': RATIR, "Schmidt": Schmidt, "AFOSC": AFOSC} - class TNG(Instrument): siteid = 5 # same as NOT peakmax = None # Lluis did not provide this so it is in header?? @@ -577,6 +568,19 @@ def get_photfilter(self): return {'B_John_10': 'B', 'g_sdss_30':'g', 'r':'r_sdss_31', 'i_sdss_32':'i', 'u_sdss_29':'u', 'V_John_11':'V_John_11' }.get(ratir_filt) return ratir_filt + + + +INSTRUMENTS = inspect.getmembers(sys.modules[__name__], + lambda member: inspect.isclass(member) and member.__module__ == __name__) + +# instruments = {'LCOGT': LCOGT, 'HAWKI': HAWKI, 'ALFOSC': ALFOSC, 'NOTCAM': NOTCAM, 'PS1': PS1, 'Liverpool': Liverpool, +# 'Omega2000': Omega2000, 'Swope': Swope, 'Swope_newheader':Swope_newheader, 'Dupont': Dupont, 'Retrocam': +# RetroCam, 'Baade': Baade, +# 'Sofi': Sofi, 'EFOSC': EFOSC, 'AstroNIRCam': AstroNIRCam, 'OmegaCam': OmegaCam, 'AndiCam': AndiCam, +# 'PairTel': PairTel, 'TJO_Meia2': TJO_MEIA2, 'TJO_Meia3': TJO_MEIA3, 'RATIR': RATIR, "Schmidt": Schmidt, "AFOSC": AFOSC} + +