Use the SkyRss or the Sky bundles

guaix-ucm · May 18, 2020 · cb44567 · cb44567
1 parent da71c41
commit cb44567
Show file tree

Hide file tree

Showing 7 changed files with 51 additions and 17 deletions.
diff --git a/megaradrp/recipes/auxiliary/acquisitionlcb.py b/megaradrp/recipes/auxiliary/acquisitionlcb.py
@@ -93,8 +93,11 @@ def run(self, rinput):
             isb = rinput.ignored_sky_bundles
             if isb:
                 self.logger.info('sky bundles ignored: %s', isb)
-            final, origin, sky = self.run_sky_subtraction(reduced1d,
-                                                          ignored_sky_bundles=isb)
+            final, origin, sky = self.run_sky_subtraction(
+                reduced1d,
+                sky_rss=rinput.sky_rss,
+                ignored_sky_bundles=isb
+            )
             self.logger.info('end sky subtraction')
         else:
             final =  reduced1d

diff --git a/megaradrp/recipes/auxiliary/acquisitionmos.py b/megaradrp/recipes/auxiliary/acquisitionmos.py
@@ -90,8 +90,11 @@ def run(self, rinput):
             isb = rinput.ignored_sky_bundles
             if isb:
                 self.logger.info('sky bundles ignored: %s', isb)
-            final, origin, sky = self.run_sky_subtraction(reduced1d,
-                                                          ignored_sky_bundles=isb)
+            final, origin, sky = self.run_sky_subtraction(
+                reduced1d,
+                sky_rss=rinput.sky_rss,
+                ignored_sky_bundles=isb
+            )
             self.logger.info('end sky subtraction')
         else:
             final =  reduced1d

diff --git a/megaradrp/recipes/calibration/lcbstdstar.py b/megaradrp/recipes/calibration/lcbstdstar.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2019 Universidad Complutense de Madrid
+# Copyright 2011-2020 Universidad Complutense de Madrid
 #
 # This file is part of Megara DRP
 #
@@ -109,7 +109,11 @@ def run(self, rinput):
         ins2 = rinput.obresult.profile
         ins2.configure_with_image(rss_data)
         self.logger.info('start sky subtraction')
-        final, origin, sky = self.run_sky_subtraction(rss_data, rinput.ignored_sky_bundles)
+        final, origin, sky = self.run_sky_subtraction(
+            rss_data,
+            sky_rss=rinput.sky_rss,
+            ignored_sky_bundles=rinput.ignored_sky_bundles
+        )
         self.logger.info('end sky subtraction')
 
         # 1 + 6  for first ring

diff --git a/megaradrp/recipes/calibration/mosstdstar.py b/megaradrp/recipes/calibration/mosstdstar.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2019 Universidad Complutense de Madrid
+# Copyright 2011-2020 Universidad Complutense de Madrid
 #
 # This file is part of Megara DRP
 #
@@ -101,7 +101,11 @@ def run(self, rinput):
         reduced2d, rss_data = super(MOSStandardRecipe, self).base_run(rinput)
 
         self.logger.info('start sky subtraction')
-        final, origin, sky = self.run_sky_subtraction(rss_data, rinput.ignored_sky_bundles)
+        final, origin, sky = self.run_sky_subtraction(
+            rss_data,
+            sky_rss=rinput.sky_rss,
+            ignored_sky_bundles=rinput.ignored_sky_bundles
+        )
         self.logger.info('end sky subtraction')
 
         # 1 + 6  for first ring

diff --git a/megaradrp/recipes/scientific/base.py b/megaradrp/recipes/scientific/base.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2019 Universidad Complutense de Madrid
+# Copyright 2011-2020 Universidad Complutense de Madrid
 #
 # This file is part of Megara DRP
 #
@@ -103,12 +103,6 @@ def run_reduction_1d(self, img, tracemap, wlcalib, fiberflat, twflat=None, offse
         reduced_rss =  flow2(img)
         return reduced_rss
 
-    def run_sky_subtraction(self, img, ignored_sky_bundles=None):
-        return subtract_sky(img,
-                            ignored_sky_bundles=ignored_sky_bundles,
-                            logger=self.logger
-                            )
-
     def compute_dar(self, img):
         import numpy.polynomial.polynomial as pol
 
@@ -118,3 +112,21 @@ def compute_dar(self, img):
 
     def centroid(self, rssdata, fiberconf, c1, c2, point):
         return compute_centroid(rssdata, fiberconf, c1, c2, point, logger=self.logger)
+
+    def run_sky_subtraction(self, img, sky_rss=None, ignored_sky_bundles=None):
+
+        if sky_rss is None:
+            self.logger.info('compute sky from SKY bundles')
+            if ignored_sky_bundles:
+                self.logger.info('sky bundles ignored: %s', ignored_sky_bundles)
+            return subtract_sky(img,
+                                ignored_sky_bundles=ignored_sky_bundles,
+                                logger=self.logger
+                                )
+        else:
+            self.logger.info('use sky RSS image')
+            return subtract_sky(img,
+                                self.datamodel,
+                                ignored_sky_bundles=ignored_sky_bundles,
+                                logger=self.logger
+                                )
diff --git a/megaradrp/recipes/scientific/lcb.py b/megaradrp/recipes/scientific/lcb.py
@@ -77,7 +77,11 @@ def run(self, rinput):
         isb = rinput.ignored_sky_bundles
         if isb:
             self.logger.info('sky bundles ignored: %s', isb)
-        final, origin, sky = self.run_sky_subtraction(rss_data, ignored_sky_bundles=isb)
+        final, origin, sky = self.run_sky_subtraction(
+            rss_data,
+            sky_rss=rinput.sky_rss,
+            ignored_sky_bundles=isb
+        )
         self.logger.info('end sky subtraction')
         # Flux calibration
         if rinput.master_sensitivity is not None:

diff --git a/megaradrp/recipes/scientific/mos.py b/megaradrp/recipes/scientific/mos.py
@@ -77,7 +77,11 @@ def run(self, rinput):
         isb = rinput.ignored_sky_bundles
         if isb:
             self.logger.info('sky bundles ignored: %s', isb)
-        final, origin, sky = self.run_sky_subtraction(rss_data, ignored_sky_bundles=isb)
+        final, origin, sky = self.run_sky_subtraction(
+            rss_data,
+            sky_rss=rinput.sky_rss,
+            ignored_sky_bundles=isb
+        )
         self.logger.info('end sky subtraction')
         # Flux calibration
         if rinput.master_sensitivity is not None: