From 17fe0e83437d7aba0d6baf66f28b37d223454e9e Mon Sep 17 00:00:00 2001 From: KimPhan Date: Thu, 10 Nov 2022 12:20:07 +0100 Subject: [PATCH 1/5] Added TNG filter --- flows/instruments/instruments.py | 31 +++++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) diff --git a/flows/instruments/instruments.py b/flows/instruments/instruments.py index 5b15b89..ec5f611 100644 --- a/flows/instruments/instruments.py +++ b/flows/instruments/instruments.py @@ -550,3 +550,34 @@ def get_photfilter(self): # 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?? + #instrument = 'LRS' + #telescope = 'TNG' + + unique_headers = {'TELESCOP':'TNG', 'INSTRUME':'LRS'} # assume we use unique headers? + + + def get_obstime(self): + return Time(self.image.header['DATE-OBS'], format='isot', scale='utc', + location=self.image.site['EarthLocation']) + + + def get_exptime(self): + exptime = super().get_exptime() + exptime *= int(self.image.header['EXPTIME']) + return exptime + + def get_photfilter(self): + ratir_filt = self.image.header['FLT_ID'] + if ratir_filt in ['B_John_10', 'g_sdss_30', 'r_sdss_31', 'i_sdss_32', + 'u_sdss_29', 'V_John_11']: + 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 + + + + From 75f80c5ba93074e4ffd54c483fc13859613fc2e9 Mon Sep 17 00:00:00 2001 From: Emir Date: Fri, 11 Nov 2022 12:01:33 +0100 Subject: [PATCH 2/5] Update README.rst --- README.rst | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.rst b/README.rst index fabf2f5..525d204 100644 --- a/README.rst +++ b/README.rst @@ -77,7 +77,8 @@ Text coming soon... username = password = -# Making a release +# Making a release + Bump sem-version when Devel is ready to merge. Merge Devel into Master, and ensure tests are passing. Create tag on Master corresponding to right semversion. From 20f70f6eebe0609157691ceb9883b74d28f76485 Mon Sep 17 00:00:00 2001 From: Emir Date: Fri, 11 Nov 2022 12:01:56 +0100 Subject: [PATCH 3/5] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 525d204..7c78a55 100644 --- a/README.rst +++ b/README.rst @@ -77,8 +77,8 @@ Text coming soon... username = password = -# Making a release - +Making a release +================ Bump sem-version when Devel is ready to merge. Merge Devel into Master, and ensure tests are passing. Create tag on Master corresponding to right semversion. From 0f4a17281d78e511ba335eaca4d6caf332c0bc91 Mon Sep 17 00:00:00 2001 From: Emir Date: Fri, 11 Nov 2022 12:05:58 +0100 Subject: [PATCH 4/5] Update README.rst --- README.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.rst b/README.rst index 7c78a55..4223337 100644 --- a/README.rst +++ b/README.rst @@ -25,7 +25,7 @@ Installation instructions >>> pip install -r requirements.txt >>> pip install -r requirements_dev.txt # for tests/development -* Last step is to create a config-file. Create a file named "config.ini" and place it in the "flows" directory. Make sure that the file can only be read by you (``chmod 0600 config.ini``)! +* **Changed with ``tendrils`` API.** If using ``tendrils``, follow the steps below, but then let ``tendrils`` know of the config file location. Alternatively, individual config file elements can be set programatically using `tendrils` and will be saved to a config file automatically. Last step is to create a config-file. Create a file named "config.ini" and place it in the "flows" directory. Make sure that the file can only be read by you (``chmod 0600 config.ini``)! This file can contain all the settings for running the pipeline. A minimal file for working with the pipeline is .. code-block:: ini @@ -36,7 +36,7 @@ Installation instructions [TNS] api_key = - Where your API token can be found on the Flows webpage. + Where your API token can be found on the Flows webpage. How to run tests From 64b454b7d408cc07a2e32bfd9ac831ea7e4d2a48 Mon Sep 17 00:00:00 2001 From: Emir Karamehmetoglu Date: Wed, 21 Dec 2022 15:51:36 +0100 Subject: [PATCH 5/5] bump version --- VERSION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION b/VERSION index 55bf145..bb251ec 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -master-v0.10.10 \ No newline at end of file +master-v1.0.0