From 3fa13f5de393bf5878b5e020d2b2e6154fbbbdf2 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Tue, 20 Mar 2018 15:58:38 +0100 Subject: [PATCH] Use copy_img from numina --- megaradrp/processing/extractobj.py | 2 +- megaradrp/processing/fiberflat.py | 4 ++-- megaradrp/recipes/calibration/modelmap.py | 2 +- megaradrp/recipes/calibration/trace.py | 2 +- megaradrp/recipes/scientific/base.py | 3 ++- megaradrp/utils.py | 5 ----- 6 files changed, 7 insertions(+), 11 deletions(-) diff --git a/megaradrp/processing/extractobj.py b/megaradrp/processing/extractobj.py index f838d337..88e172a7 100644 --- a/megaradrp/processing/extractobj.py +++ b/megaradrp/processing/extractobj.py @@ -19,8 +19,8 @@ from scipy.spatial import KDTree from scipy.ndimage.filters import gaussian_filter +from numina.frame.utils import copy_img -from megaradrp.utils import copy_img from megaradrp.processing.fluxcalib import update_flux_limits diff --git a/megaradrp/processing/fiberflat.py b/megaradrp/processing/fiberflat.py index 3fce8880..1afda3c5 100644 --- a/megaradrp/processing/fiberflat.py +++ b/megaradrp/processing/fiberflat.py @@ -1,5 +1,5 @@ # -# Copyright 2011-2017 Universidad Complutense de Madrid +# Copyright 2011-2018 Universidad Complutense de Madrid # # This file is part of Megara DRP # @@ -13,8 +13,8 @@ from astropy.io import fits import numpy from numina.flow.processing import Corrector +from numina.frame.utils import copy_img -from megaradrp.utils import copy_img _logger = logging.getLogger(__name__) diff --git a/megaradrp/recipes/calibration/modelmap.py b/megaradrp/recipes/calibration/modelmap.py index 6595b9af..2493e341 100644 --- a/megaradrp/recipes/calibration/modelmap.py +++ b/megaradrp/recipes/calibration/modelmap.py @@ -23,8 +23,8 @@ from numina.core import Product, Requirement, Parameter from numina.array import combine from numina.modeling.gaussbox import GaussBox, gauss_box_model +from numina.frame.utils import copy_img -from megaradrp.utils import copy_img from megaradrp.products.modelmap import ModelMap from megaradrp.products.modelmap import GeometricModel from megaradrp.processing.aperture import ApertureExtractor diff --git a/megaradrp/recipes/calibration/trace.py b/megaradrp/recipes/calibration/trace.py index 9a8c6ab1..844c5593 100644 --- a/megaradrp/recipes/calibration/trace.py +++ b/megaradrp/recipes/calibration/trace.py @@ -27,8 +27,8 @@ from skimage.filters import threshold_otsu from skimage.feature import peak_local_max from scipy.ndimage.filters import minimum_filter +from numina.frame.utils import copy_img -from megaradrp.utils import copy_img from megaradrp.processing.aperture import ApertureExtractor from megaradrp.processing.combine import basic_processing_with_combination from megaradrp.products import TraceMap diff --git a/megaradrp/recipes/scientific/base.py b/megaradrp/recipes/scientific/base.py index 195338ed..f4bc0f18 100644 --- a/megaradrp/recipes/scientific/base.py +++ b/megaradrp/recipes/scientific/base.py @@ -14,11 +14,12 @@ from numina.core.requirements import ObservationResultRequirement from numina.flow import SerialFlow from numina.array import combine +from numina.frame.utils import copy_img from megaradrp.core.recipe import MegaraBaseRecipe import megaradrp.requirements as reqs from megaradrp.processing.combine import basic_processing_with_combination -from megaradrp.utils import copy_img + from megaradrp.processing.aperture import ApertureExtractor from megaradrp.processing.wavecalibration import WavelengthCalibrator from megaradrp.processing.fiberflat import FlipLR, FiberFlatCorrector diff --git a/megaradrp/utils.py b/megaradrp/utils.py index 2effc38c..e1c371cb 100644 --- a/megaradrp/utils.py +++ b/megaradrp/utils.py @@ -13,11 +13,6 @@ import astropy.io.fits as fits -def copy_img(img): - """Copy an HDUList""" - return fits.HDUList([hdu.copy() for hdu in img]) - - def add_collapsed_mos_extension(img, size=7, axis=0): """Add a collapsed image extension