Skip to content

Commit

Permalink
Parameter 'extraction_offset' accepts scalar values (fixes #206)
Browse files Browse the repository at this point in the history
  • Loading branch information
sergiopasra committed May 3, 2018
1 parent 1a1fd90 commit d57cc43
Show file tree
Hide file tree
Showing 6 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions megaradrp/recipes/auxiliary/focusspec.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2016-2017 Universidad Complutense de Madrid
# Copyright 2016-2018 Universidad Complutense de Madrid
#
# This file is part of Megara DRP
#
Expand Down Expand Up @@ -89,7 +89,7 @@ class FocusSpectrographRecipe(MegaraBaseRecipe):
master_dark = reqs.MasterDarkRequirement()
master_bpm = reqs.MasterBPMRequirement()
master_traces = reqs.MasterAperturesRequirement()
extraction_offset = Parameter([0.0], 'Offset traces for extraction')
extraction_offset = Parameter([0.0], 'Offset traces for extraction', accept_scalar=True)
master_wlcalib = reqs.WavelengthCalibrationRequirement()

nfibers = Parameter(10, "The results are sampled every nfibers")
Expand Down
4 changes: 2 additions & 2 deletions megaradrp/recipes/auxiliary/focustel.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2016-2017 Universidad Complutense de Madrid
# Copyright 2016-2018 Universidad Complutense de Madrid
#
# This file is part of Megara DRP
#
Expand Down Expand Up @@ -60,7 +60,7 @@ class FocusTelescopeRecipe(ImageRecipe):
master_dark = reqs.MasterDarkRequirement()
master_bpm = reqs.MasterBPMRequirement()
master_traces = reqs.MasterAperturesRequirement()
extraction_offset = Parameter([0.0], 'Offset traces for extraction')
extraction_offset = Parameter([0.0], 'Offset traces for extraction', accept_scalar=True)
master_wlcalib = reqs.WavelengthCalibrationRequirement()
position = Requirement(list, "Position of the reference object", default=(0, 0))
# Products
Expand Down
4 changes: 2 additions & 2 deletions megaradrp/recipes/calibration/arc.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
# Copyright 2015-2017 Universidad Complutense de Madrid
# Copyright 2015-2018 Universidad Complutense de Madrid
#
# This file is part of Megara DRP
#
Expand Down Expand Up @@ -104,7 +104,7 @@ class ArcCalibrationRecipe(MegaraBaseRecipe):
master_dark = reqs.MasterDarkRequirement()
master_bpm = reqs.MasterBPMRequirement()
master_apertures = reqs.MasterAperturesRequirement()
extraction_offset = Parameter([0.0], 'Offset traces for extraction')
extraction_offset = Parameter([0.0], 'Offset traces for extraction', accept_scalar=True)
lines_catalog = Requirement(LinesCatalog, 'Catalog of lines')
polynomial_degree = Parameter(5, 'Polynomial degree of arc calibration',
as_list=True, nelem='+',
Expand Down
2 changes: 1 addition & 1 deletion megaradrp/recipes/calibration/flat.py
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@ class FiberFlatRecipe(MegaraBaseRecipe):
smoothing_window = Parameter(31, 'Window for smoothing (must be odd)',
validator=_smoothing_window_check
)
extraction_offset = Parameter([0.0], 'Offset traces for extraction')
extraction_offset = Parameter([0.0], 'Offset traces for extraction', accept_scalar=True)
master_wlcalib = reqs.WavelengthCalibrationRequirement()

# Products
Expand Down
2 changes: 1 addition & 1 deletion megaradrp/recipes/calibration/twilight.py
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ class RecipeInput(recipeio.RecipeInput):
master_bpm = reqs.MasterBPMRequirement()
master_slitflat = reqs.MasterSlitFlatRequirement()
master_traces = reqs.MasterAperturesRequirement()
extraction_offset = Parameter([0.0], 'Offset traces for extraction')
extraction_offset = Parameter([0.0], 'Offset traces for extraction', accept_scalar=True)
normalize_region = Parameter([1900, 2100], 'Region used to normalize the flat-field',
validator=pixel_2d_check)
master_wlcalib = reqs.WavelengthCalibrationRequirement()
Expand Down
2 changes: 1 addition & 1 deletion megaradrp/recipes/scientific/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ class ImageRecipe(MegaraBaseRecipe):
master_fiberflat = reqs.MasterFiberFlatRequirement()
master_twilight = reqs.MasterTwilightRequirement()
master_traces = reqs.MasterAperturesRequirement()
extraction_offset = Parameter([0.0], 'Offset traces for extraction')
extraction_offset = Parameter([0.0], 'Offset traces for extraction', accept_scalar=True)
ignored_sky_bundles = Parameter([], 'Ignore these sky bundles')
master_sensitivity = reqs.SensitivityRequirement()
reference_extinction = reqs.ReferenceExtinction()
Expand Down

0 comments on commit d57cc43

Please sign in to comment.