Add combination method parameter in flat and image recipes

* This allows to use `method: sigmaclip` in yaml obs files
guaix-ucm · Sep 3, 2019 · 00092eb · 00092eb
1 parent 034b523
commit 00092eb
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 4 deletions.
diff --git a/megaradrp/recipes/calibration/flat.py b/megaradrp/recipes/calibration/flat.py
@@ -81,6 +81,16 @@ class FiberFlatRecipe(MegaraBaseRecipe):
     """
 
     # Requirements
+    method = Parameter(
+        'median',
+        description='Combination method',
+        choices=['mean', 'median', 'sigmaclip']
+    )
+    method_kwargs = Parameter(
+        dict(),
+        description='Arguments for combination method',
+        optional=True
+    )
     master_bias = reqs.MasterBiasRequirement()
     master_dark = reqs.MasterDarkRequirement()
     master_bpm = reqs.MasterBPMRequirement()
@@ -99,7 +109,10 @@ class FiberFlatRecipe(MegaraBaseRecipe):
 
     def process_flat2d(self, rinput):
         flow = self.init_filters(rinput, rinput.obresult.configuration)
-        final_image = basic_processing_with_combination(rinput, flow, method=combine.median)
+        fmethod = getattr(combine, rinput.method)
+        final_image = basic_processing_with_combination(
+            rinput, flow, method=fmethod,method_kwargs=rinput.method_kwargs,
+        )
         hdr = final_image[0].header
         self.set_base_headers(hdr)
         return final_image

diff --git a/megaradrp/recipes/scientific/base.py b/megaradrp/recipes/scientific/base.py
@@ -1,5 +1,5 @@
 #
-# Copyright 2011-2018 Universidad Complutense de Madrid
+# Copyright 2011-2019 Universidad Complutense de Madrid
 #
 # This file is part of Megara DRP
 #
@@ -31,8 +31,18 @@
 class ImageRecipe(MegaraBaseRecipe):
     """Base Image."""
 
-    # Requirements  
+    # Requirements
     obresult = ObservationResultRequirement()
+    method = Parameter(
+        'median',
+        description='Combination method',
+        choices=['mean', 'median', 'sigmaclip']
+    )
+    method_kwargs = Parameter(
+        dict(),
+        description='Arguments for combination method',
+        optional=True
+    )
     master_bias = reqs.MasterBiasRequirement()
     master_dark = reqs.MasterDarkRequirement()
     master_bpm = reqs.MasterBPMRequirement()
@@ -51,7 +61,13 @@ def base_run(self, rinput):
 
         # 2D reduction
         flow1 = self.init_filters(rinput, rinput.obresult.configuration)
-        img = basic_processing_with_combination(rinput, flow1, method=combine.median)
+        fmethod = getattr(combine, rinput.method)
+
+        img = basic_processing_with_combination(
+            rinput, flow1,
+            method=fmethod,
+            method_kwargs=rinput.method_kwargs
+        )
         hdr = img[0].header
         self.set_base_headers(hdr)