Merge branch 'develop'

avigan · Jun 15, 2021 · 7dcbcb9 · 7dcbcb9
2 parents 66fcaf1 + 759ae3d
commit 7dcbcb9
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 6 deletions.
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 # setup
 setup(
     name='vlt-sphere',
-    version='1.4.2',
+    version='1.4.3',
     description='Reduction and analysis code for the VLT/SPHERE instrument',
     long_description=long_description,
     long_description_content_type='text/markdown',

diff --git a/sphere/IFS.py b/sphere/IFS.py
@@ -978,7 +978,18 @@ def sort_files(self):
             hdr = hdu[0].header
 
             for k, sk in zip(keywords, keywords_short):
-                files_info.loc[f, sk] = hdr.get(k)
+                if k == 'HIERARCH ESO INS4 DROT2 BEGIN':
+                    # in June 2021 ESO changed INS4 DROT2 BEGIN to INS4 DROT2 START
+                    v_begin = hdr.get('HIERARCH ESO INS4 DROT2 BEGIN')
+                    v_start = hdr.get('HIERARCH ESO INS4 DROT2 START')
+                    files_info.loc[f, sk] = v_begin if v_begin else v_start
+                elif k == 'HIERARCH ESO INS4 DROT3 BEGIN':
+                    # in June 2021 ESO changed INS4 DROT3 BEGIN to INS4 DROT3 START
+                    v_begin = hdr.get('HIERARCH ESO INS3 DROT2 BEGIN')
+                    v_start = hdr.get('HIERARCH ESO INS3 DROT2 START')
+                    files_info.loc[f, sk] = v_begin if v_begin else v_start
+                else:
+                    files_info.loc[f, sk] = hdr.get(k)
 
             hdu.close()
 

diff --git a/sphere/IRDIS/ImagingReduction.py b/sphere/IRDIS/ImagingReduction.py
@@ -601,7 +601,18 @@ def sort_files(self):
             hdr = hdu[0].header
 
             for k, sk in zip(keywords, keywords_short):
-                files_info.loc[f, sk] = hdr.get(k)
+                if k == 'HIERARCH ESO INS4 DROT2 BEGIN':
+                    # in June 2021 ESO changed INS4 DROT2 BEGIN to INS4 DROT2 START
+                    v_begin = hdr.get('HIERARCH ESO INS4 DROT2 BEGIN')
+                    v_start = hdr.get('HIERARCH ESO INS4 DROT2 START')
+                    files_info.loc[f, sk] = v_begin if v_begin else v_start
+                elif k == 'HIERARCH ESO INS4 DROT3 BEGIN':
+                    # in June 2021 ESO changed INS4 DROT3 BEGIN to INS4 DROT3 START
+                    v_begin = hdr.get('HIERARCH ESO INS3 DROT2 BEGIN')
+                    v_start = hdr.get('HIERARCH ESO INS3 DROT2 START')
+                    files_info.loc[f, sk] = v_begin if v_begin else v_start
+                else:
+                    files_info.loc[f, sk] = hdr.get(k)
 
             hdu.close()
 

diff --git a/sphere/IRDIS/SpectroReduction.py b/sphere/IRDIS/SpectroReduction.py
@@ -658,7 +658,18 @@ def sort_files(self):
             hdr = hdu[0].header
 
             for k, sk in zip(keywords, keywords_short):
-                files_info.loc[f, sk] = hdr.get(k)
+                if k == 'HIERARCH ESO INS4 DROT2 BEGIN':
+                    # in June 2021 ESO changed INS4 DROT2 BEGIN to INS4 DROT2 START
+                    v_begin = hdr.get('HIERARCH ESO INS4 DROT2 BEGIN')
+                    v_start = hdr.get('HIERARCH ESO INS4 DROT2 START')
+                    files_info.loc[f, sk] = v_begin if v_begin else v_start
+                elif k == 'HIERARCH ESO INS4 DROT3 BEGIN':
+                    # in June 2021 ESO changed INS4 DROT3 BEGIN to INS4 DROT3 START
+                    v_begin = hdr.get('HIERARCH ESO INS3 DROT2 BEGIN')
+                    v_start = hdr.get('HIERARCH ESO INS3 DROT2 START')
+                    files_info.loc[f, sk] = v_begin if v_begin else v_start
+                else:
+                    files_info.loc[f, sk] = hdr.get(k)
 
             hdu.close()
 

diff --git a/sphere/__init__.py b/sphere/__init__.py
@@ -1,7 +1,7 @@
 __author__    = 'Arthur Vigan'
 __copyright__ = 'Copyright (C) 2017-2021 Arthur Vigan'
 __license__   = 'MIT'
-__version__   = '1.4.2'
+__version__   = '1.4.3'
 
 import logging
 import enum

diff --git a/sphere/instruments/keywords_irdifs.dat b/sphere/instruments/keywords_irdifs.dat
@@ -60,11 +60,16 @@ HIERARCH ESO AOS HOLOOP STATE
 HIERARCH ESO AOS IRLOOP STATE
 HIERARCH ESO AOS PUPLOOP STATE
 
-# CPI
+# CPI - derotator
 HIERARCH ESO INS4 DROT2 BEGIN
 HIERARCH ESO INS4 DROT2 END
 HIERARCH ESO INS4 DROT2 POSANG
 
+# CPI - half-wave plate
+HIERARCH ESO INS4 DROT3 BEGIN
+HIERARCH ESO INS4 DROT3 END
+HIERARCH ESO INS4 DROT3 POSANG
+
 # IRDIS
 HIERARCH ESO INS1 PAC X
 HIERARCH ESO INS1 PAC Y