Merge pull request #125 from SNflows/devel

v1.0 release -- Do not release before tests.

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 = <AUFLOWS_BOT 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
@@ -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.

VERSION

@@ -1 +1 @@
-master-v0.10.10
+master-v1.0.0

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
+
+
+
+