Skip to content

devel to master after solving a couple of things #138

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lgalbany merged 4 commits into from
Feb 8, 2023
Merged

devel to master after solving a couple of things #138

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
92ebd9d
Merge pull request #127 from SNflows/master
emirkmo Dec 21, 2022
57ae353
Update requirements.txt
lgalbany Feb 8, 2023
722f62e
Update requirements.txt
lgalbany Feb 8, 2023
6af9c79
add TNG
lgalbany Feb 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 13 additions & 9 deletions flows/instruments/instruments.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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??
Expand All @@ -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}





Expand Down
4 changes: 2 additions & 2 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
numpy >= 1.16
numpy == 1.23.5
scipy >= 1.5.4
astropy == 5.0.4
photutils == 1.1.0
Expand All @@ -18,4 +18,4 @@ sep
astroalign > 2.3
networkx
astroquery >= 0.4.2
tendrils >= 0.1.5
tendrils >= 0.1.5