Merge pull request #49 from temuller/master

Add grisms 18 and 20
svalenti · Sep 10, 2019 · 178ac3c · 178ac3c
2 parents dbc7baf + 8cb16dc
commit 178ac3c
Show file tree

Hide file tree

Showing 41 changed files with 53,045 additions and 49,702 deletions.
diff --git a/.gitignore b/.gitignore
@@ -14,11 +14,19 @@ efoscastrodef.pyc
 efosccalibdef.pyc
 efoscfastspecdef.pyc
 efoscphotredudef.pyc
-efoscspec1Ddef.pyc
-efoscspec2Ddef.pyc
+#efoscspec1Ddef.pyc
+#efoscspec2Ddef.pyc
 soficalibdef.pyc
 sofiphotredudef.pyc
 sofispec1Ddef.pyc
 sofispec2Ddef.pyc
 sqlcl.pyc
-util.pyc
+#util.pyc
+
+# Added by Tomás M.
+test
+Test_data_GR18
+Test_data_GR18_new
+Test_data_GR20
+trunk/src/ntt.egg-info
+trunk/src/ntt/*.pyc
diff --git a/trunk/CHANGES.txt b/trunk/CHANGES.txt
@@ -118,4 +118,9 @@ long keyword cut correctly
 
 
 
+v2.4.0, 20190909 -- changes:
+
+- Grisms 18 and 20 added (Free/1.0" only)
+- Grism 11, Free/1.5": idarc and arc files updated
+- Grism 16, OG530/1.5": idarc and arc files updated
 
diff --git a/trunk/PKG-INFO b/trunk/PKG-INFO
@@ -1,14 +1,14 @@
 Metadata-Version: 1.1
 Name: ntt
-Version: 2.3.0
+Version: 2.4.0
 Summary: NTT is a package to reduce efosc and sofi data
 Home-page: ftp.oapd.inaf.it
 Author: S. Valenti
 Author-email: stefano.valenti@oapd.inaf.it
 License: LICENSE.txt
 Description: ###########################################################################
         # 
-        #                                NTT Pipeline version 2.3.0
+        #                                NTT Pipeline version 2.4.0
         #
         #                                INSTALLATION
         ###########################################################################

diff --git a/trunk/README.txt b/trunk/README.txt
@@ -1,6 +1,6 @@
 ###########################################################################
 # 
-#                                NTT Pipeline version 2.3.0
+#                                NTT Pipeline version 2.4.0
 #
 #                                INSTALLATION
 ###########################################################################

diff --git a/trunk/setup.py b/trunk/setup.py
@@ -8,7 +8,6 @@
 for scheme in INSTALL_SCHEMES.values():
     scheme['data'] = scheme['purelib']
 
-
 from imp import find_module
 
 try:

diff --git a/trunk/src/ntt.egg-info/PKG-INFO b/trunk/src/ntt.egg-info/PKG-INFO