Support for INS4 DROT keywords change

In June 2021 ESO changed INS4 DROT BEGIN to INS4 DROT START
avigan · Jun 15, 2021 · a0ed837 · a0ed837
1 parent e5341a1
commit a0ed837
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 3 deletions.
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()