Merge branch 'develop' into master

avigan · Jan 4, 2021 · 66fcaf1 · 66fcaf1
2 parents 7f4eb80 + 514ee31
commit 66fcaf1
Show file tree

Hide file tree

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

diff --git a/sphere/SPARTA.py b/sphere/SPARTA.py
@@ -667,7 +667,8 @@ def sph_sparta_dtts(self, plot=True):
         toolbox.compute_times(dtts_info, logger=self._logger)
 
         # compute angles (ra, dec, parang)
-        ret = toolbox.compute_angles(dtts_info, logger=self._logger)
+        true_north = self.config['cal_true_north']
+        ret = toolbox.compute_angles(dtts_info, true_north, logger=self._logger)
         if ret == sphere.ERROR:
             self._update_recipe_status('sph_sparta_dtts', sphere.ERROR)
             self._status = sphere.FATAL
@@ -809,7 +810,8 @@ def sph_sparta_wfs_parameters(self):
         toolbox.compute_times(visloop_info, logger=self._logger)
 
         # compute angles (ra, dec, parang)
-        ret = toolbox.compute_angles(visloop_info, logger=self._logger)
+        true_north = self.config['cal_true_north']
+        ret = toolbox.compute_angles(visloop_info, true_north, logger=self._logger)
         if ret == sphere.ERROR:
             self._update_recipe_status('sph_sparta_wfs_parameters', sphere.ERROR)
             self._status = sphere.FATAL
@@ -872,7 +874,8 @@ def sph_sparta_wfs_parameters(self):
         toolbox.compute_times(irloop_info, logger=self._logger)
 
         # compute angles (ra, dec, parang)
-        ret = toolbox.compute_angles(irloop_info, logger=self._logger)
+        true_north = self.config['cal_true_north']
+        ret = toolbox.compute_angles(irloop_info, true_north, logger=self._logger)
         if ret == sphere.ERROR:
             self._update_recipe_status('sph_sparta_wfs_parameters', sphere.ERROR)
             self._status = sphere.FATAL
@@ -957,7 +960,8 @@ def sph_sparta_atmospheric_parameters(self):
         toolbox.compute_times(atmos_info, logger=self._logger)
 
         # compute angles (ra, dec, parang)
-        ret = toolbox.compute_angles(atmos_info, logger=self._logger)
+        true_north = self.config['cal_true_north']
+        ret = toolbox.compute_angles(atmos_info, true_north, logger=self._logger)
         if ret == sphere.ERROR:
             self._update_recipe_status('sph_sparta_atmospheric_parameters', sphere.ERROR)
             self._status = sphere.FATAL

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.1'
+__version__   = '1.4.2'
 
 import logging
 import enum

diff --git a/sphere/instruments/SPARTA.ini b/sphere/instruments/SPARTA.ini
@@ -9,6 +9,9 @@ name = 'SPARTA'
 #
 [reduction]
 
+# true North
+cal_true_north = -1.75
+
 # misc
 misc_plot            = True
 misc_query_databases = True