Merge branch 'develop' into master

avigan · Dec 29, 2020 · 7f4eb80 · 7f4eb80
2 parents 1afb75f + 5798499
commit 7f4eb80
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 14 deletions.
diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 # setup
 setup(
     name='vlt-sphere',
-    version='1.4',
+    version='1.4.1',
     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
@@ -2905,13 +2905,12 @@ def sph_ifs_combine_data(self, cpix=True, psf_dim=80, science_dim=290, correct_a
 
           - *_cube: the (x,y,time,lambda) cube
 
-          - *_parang: the parallactic angle vector
-
           - *_derot: the derotation angles vector. This vector takes
-                     into account the parallactic angle and any
-                     instrumental pupil offset. This is the values
-                     that need to be used for aligning the images with
-                     North up and East left.
+                     into account the parallactic angle, the default 
+                     -1.75° true North offset, and any instrumental 
+                     pupil offset. This is the values that need to be 
+                     used for aligning the images with North up and 
+                     East left.
 
           - *_frames: a csv file with all the information for every
                       frames. There is one line by time step in the

diff --git a/sphere/IRDIS/ImagingReduction.py b/sphere/IRDIS/ImagingReduction.py
@@ -1515,13 +1515,12 @@ def sph_ird_combine_data(self, cpix=True, psf_dim=80, science_dim=290, correct_a
 
           - *_cube: the (x,y,time,lambda) cube
 
-          - *_parang: the parallactic angle vector
-
           - *_derot: the derotation angles vector. This vector takes
-                     into account the parallactic angle and any
-                     instrumental pupil offset. This is the values
-                     that need to be used for aligning the images with
-                     North up and East left.
+                     into account the parallactic angle, the default 
+                     -1.75° true North offset, and any instrumental 
+                     pupil offset. This is the values that need to be 
+                     used for aligning the images with North up and 
+                     East left.
 
           - *_frames: a csv file with all the information for every
                       frames. There is one line by time step in the

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'
+__version__   = '1.4.1'
 
 import logging
 import enum