From c2837747ad8bdd1c00e0e4474607f8543f19b2d1 Mon Sep 17 00:00:00 2001 From: Sergio Pascual Date: Mon, 18 May 2020 23:57:20 +0200 Subject: [PATCH] Rename module types to ntypes (fixes #286) --- megaradrp/core/recipe.py | 4 ++-- megaradrp/{types.py => ntypes.py} | 0 megaradrp/products/__init__.py | 2 +- megaradrp/recipes/auxiliary/acquisitionlcb.py | 2 +- megaradrp/recipes/auxiliary/acquisitionmos.py | 2 +- megaradrp/recipes/auxiliary/focusspec.py | 2 +- megaradrp/recipes/calibration/arc.py | 2 +- megaradrp/recipes/calibration/base.py | 2 +- megaradrp/recipes/calibration/bias.py | 2 +- megaradrp/recipes/calibration/bpm.py | 2 +- megaradrp/recipes/calibration/dark.py | 2 +- megaradrp/recipes/calibration/flat.py | 4 ++-- megaradrp/recipes/calibration/lcbstdstar.py | 6 ++--- megaradrp/recipes/calibration/modelmap.py | 2 +- megaradrp/recipes/calibration/mosstdstar.py | 6 ++--- megaradrp/recipes/calibration/slitflat.py | 4 ++-- megaradrp/recipes/calibration/trace.py | 2 +- megaradrp/recipes/calibration/twilight.py | 4 ++-- megaradrp/recipes/combined/extinctionstar.py | 2 +- megaradrp/recipes/combined/sensstar.py | 2 +- megaradrp/recipes/scientific/lcb.py | 2 +- .../recipes/scientific/lcbfastmapping.py | 2 +- megaradrp/recipes/scientific/mos.py | 2 +- megaradrp/requirements.py | 24 +++++++++---------- .../tests/{test_types.py => test_ntypes.py} | 2 +- 25 files changed, 43 insertions(+), 43 deletions(-) rename megaradrp/{types.py => ntypes.py} (100%) rename megaradrp/tests/{test_types.py => test_ntypes.py} (98%) diff --git a/megaradrp/core/recipe.py b/megaradrp/core/recipe.py index 6d198c4e..97ab947c 100644 --- a/megaradrp/core/recipe.py +++ b/megaradrp/core/recipe.py @@ -51,8 +51,8 @@ def run_qc(self, recipe_input, recipe_result): return recipe_result def types_getter(self): - from megaradrp.types import MasterBias, MasterDark, MasterBPM, MasterSlitFlat - from megaradrp.types import DiffuseLightCorrection + from megaradrp.ntypes import MasterBias, MasterDark, MasterBPM, MasterSlitFlat + from megaradrp.ntypes import DiffuseLightCorrection imgtypes = [MasterBPM, MasterBias, MasterDark, MasterSlitFlat, DiffuseLightCorrection] getters = [cor.get_corrector_bpm, cor.get_corrector_bias, [cor.get_corrector_dark, cor.get_corrector_gain], diff --git a/megaradrp/types.py b/megaradrp/ntypes.py similarity index 100% rename from megaradrp/types.py rename to megaradrp/ntypes.py diff --git a/megaradrp/products/__init__.py b/megaradrp/products/__init__.py index 2e3c68d0..82a7ca25 100644 --- a/megaradrp/products/__init__.py +++ b/megaradrp/products/__init__.py @@ -1,7 +1,7 @@ # FIXME: workaround -from megaradrp.types import MasterBias +from megaradrp.ntypes import MasterBias from .tracemap import TraceMap, GeometricTrace from .wavecalibration import WavelengthCalibration diff --git a/megaradrp/recipes/auxiliary/acquisitionlcb.py b/megaradrp/recipes/auxiliary/acquisitionlcb.py index b2962173..30a50dfb 100644 --- a/megaradrp/recipes/auxiliary/acquisitionlcb.py +++ b/megaradrp/recipes/auxiliary/acquisitionlcb.py @@ -20,7 +20,7 @@ from numina.constants import FWHM_G from megaradrp.recipes.scientific.base import ImageRecipe -from megaradrp.types import ProcessedRSS, ProcessedFrame +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame class AcquireLCBRecipe(ImageRecipe): diff --git a/megaradrp/recipes/auxiliary/acquisitionmos.py b/megaradrp/recipes/auxiliary/acquisitionmos.py index 3280f27a..1e71e334 100644 --- a/megaradrp/recipes/auxiliary/acquisitionmos.py +++ b/megaradrp/recipes/auxiliary/acquisitionmos.py @@ -19,7 +19,7 @@ from megaradrp.datamodel import TargetType from megaradrp.recipes.scientific.base import ImageRecipe -from megaradrp.types import ProcessedRSS, ProcessedFrame +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame from megaradrp.utils import add_collapsed_mos_extension diff --git a/megaradrp/recipes/auxiliary/focusspec.py b/megaradrp/recipes/auxiliary/focusspec.py index a59f14eb..4fac4b1b 100644 --- a/megaradrp/recipes/auxiliary/focusspec.py +++ b/megaradrp/recipes/auxiliary/focusspec.py @@ -29,7 +29,7 @@ from numina.array.peaks.peakdet import find_peaks_indexes, refine_peaks from megaradrp.core.recipe import MegaraBaseRecipe -from megaradrp.types import FocusWavelength, ProcessedFrame +from megaradrp.ntypes import FocusWavelength, ProcessedFrame import megaradrp.requirements as reqs from megaradrp.processing.combine import basic_processing_with_combination_frames from megaradrp.processing.aperture import ApertureExtractor diff --git a/megaradrp/recipes/calibration/arc.py b/megaradrp/recipes/calibration/arc.py index d4587122..ee1e883e 100644 --- a/megaradrp/recipes/calibration/arc.py +++ b/megaradrp/recipes/calibration/arc.py @@ -37,7 +37,7 @@ from numina.util.flow import SerialFlow from numina.array import combine -from megaradrp.types import ProcessedFrame, ProcessedRSS +from megaradrp.ntypes import ProcessedFrame, ProcessedRSS from megaradrp.processing.combine import basic_processing_with_combination from megaradrp.processing.aperture import ApertureExtractor from megaradrp.processing.fiberflat import Splitter, FlipLR diff --git a/megaradrp/recipes/calibration/base.py b/megaradrp/recipes/calibration/base.py index a8f5423c..11ee8c6e 100644 --- a/megaradrp/recipes/calibration/base.py +++ b/megaradrp/recipes/calibration/base.py @@ -17,7 +17,7 @@ from megaradrp.core.recipe import MegaraBaseRecipe from megaradrp.requirements import MasterBiasRequirement -from megaradrp.types import MasterFiberFlat +from megaradrp.ntypes import MasterFiberFlat _logger = logging.getLogger('numina.recipes.megara') diff --git a/megaradrp/recipes/calibration/bias.py b/megaradrp/recipes/calibration/bias.py index 2edc44e1..1ea39b35 100644 --- a/megaradrp/recipes/calibration/bias.py +++ b/megaradrp/recipes/calibration/bias.py @@ -12,7 +12,7 @@ from megaradrp.processing.combine import basic_processing_with_combination from megaradrp.core.recipe import MegaraBaseRecipe -from megaradrp.types import MasterBias +from megaradrp.ntypes import MasterBias from megaradrp.requirements import MasterBPMRequirement diff --git a/megaradrp/recipes/calibration/bpm.py b/megaradrp/recipes/calibration/bpm.py index 4e795281..abfc7c9b 100644 --- a/megaradrp/recipes/calibration/bpm.py +++ b/megaradrp/recipes/calibration/bpm.py @@ -20,7 +20,7 @@ from megaradrp.processing.combine import basic_processing_with_combination_frames from megaradrp.core.recipe import MegaraBaseRecipe -from megaradrp.types import MasterBPM +from megaradrp.ntypes import MasterBPM import megaradrp.requirements as reqs diff --git a/megaradrp/recipes/calibration/dark.py b/megaradrp/recipes/calibration/dark.py index 0c4f5d4a..6127e08f 100644 --- a/megaradrp/recipes/calibration/dark.py +++ b/megaradrp/recipes/calibration/dark.py @@ -14,7 +14,7 @@ from megaradrp.core.recipe import MegaraBaseRecipe from megaradrp.requirements import MasterBiasRequirement -from megaradrp.types import MasterDark +from megaradrp.ntypes import MasterDark from megaradrp.processing.combine import basic_processing_with_combination diff --git a/megaradrp/recipes/calibration/flat.py b/megaradrp/recipes/calibration/flat.py index cd8187ad..8f4a85ef 100644 --- a/megaradrp/recipes/calibration/flat.py +++ b/megaradrp/recipes/calibration/flat.py @@ -18,9 +18,9 @@ import numina.exceptions from megaradrp.core.recipe import MegaraBaseRecipe -from megaradrp.types import MasterFiberFlat +from megaradrp.ntypes import MasterFiberFlat import megaradrp.requirements as reqs -from megaradrp.types import ProcessedRSS, ProcessedFrame +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame import megaradrp.datamodel as dm # Flat 2D diff --git a/megaradrp/recipes/calibration/lcbstdstar.py b/megaradrp/recipes/calibration/lcbstdstar.py index b2629bd3..dd48a43f 100644 --- a/megaradrp/recipes/calibration/lcbstdstar.py +++ b/megaradrp/recipes/calibration/lcbstdstar.py @@ -26,9 +26,9 @@ from megaradrp.processing.extractobj import extract_star, generate_sensitivity from megaradrp.processing.extractobj import mix_values, compute_broadening from megaradrp.recipes.scientific.base import ImageRecipe -from megaradrp.types import ProcessedRSS, ProcessedFrame, ProcessedSpectrum -from megaradrp.types import ReferenceSpectrumTable, ReferenceExtinctionTable -from megaradrp.types import MasterSensitivity +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame, ProcessedSpectrum +from megaradrp.ntypes import ReferenceSpectrumTable, ReferenceExtinctionTable +from megaradrp.ntypes import MasterSensitivity class LCBStandardRecipe(ImageRecipe): diff --git a/megaradrp/recipes/calibration/modelmap.py b/megaradrp/recipes/calibration/modelmap.py index 4b24aecc..25034792 100644 --- a/megaradrp/recipes/calibration/modelmap.py +++ b/megaradrp/recipes/calibration/modelmap.py @@ -28,7 +28,7 @@ from megaradrp.products.modelmap import ModelMap from megaradrp.products.modelmap import GeometricModel from megaradrp.processing.aperture import ApertureExtractor -from megaradrp.types import ProcessedImage, ProcessedRSS +from megaradrp.ntypes import ProcessedImage, ProcessedRSS from megaradrp.processing.combine import basic_processing_with_combination from megaradrp.core.recipe import MegaraBaseRecipe import megaradrp.requirements as reqs diff --git a/megaradrp/recipes/calibration/mosstdstar.py b/megaradrp/recipes/calibration/mosstdstar.py index cc195286..0e649fb7 100644 --- a/megaradrp/recipes/calibration/mosstdstar.py +++ b/megaradrp/recipes/calibration/mosstdstar.py @@ -24,9 +24,9 @@ from megaradrp.processing.extractobj import extract_star, generate_sensitivity from megaradrp.processing.extractobj import mix_values, compute_broadening from megaradrp.recipes.scientific.base import ImageRecipe -from megaradrp.types import ProcessedRSS, ProcessedFrame, ProcessedSpectrum -from megaradrp.types import ReferenceSpectrumTable, ReferenceExtinctionTable -from megaradrp.types import MasterSensitivity +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame, ProcessedSpectrum +from megaradrp.ntypes import ReferenceSpectrumTable, ReferenceExtinctionTable +from megaradrp.ntypes import MasterSensitivity class MOSStandardRecipe(ImageRecipe): diff --git a/megaradrp/recipes/calibration/slitflat.py b/megaradrp/recipes/calibration/slitflat.py index 0714baff..0bd19772 100644 --- a/megaradrp/recipes/calibration/slitflat.py +++ b/megaradrp/recipes/calibration/slitflat.py @@ -17,10 +17,10 @@ from numina.array import combine from numina.core import Result, Parameter -from megaradrp.types import ProcessedFrame +from megaradrp.ntypes import ProcessedFrame from megaradrp.processing.combine import basic_processing_with_combination from megaradrp.core.recipe import MegaraBaseRecipe -from megaradrp.types import MasterSlitFlat +from megaradrp.ntypes import MasterSlitFlat import megaradrp.requirements as reqs import megaradrp.core.correctors as cor diff --git a/megaradrp/recipes/calibration/trace.py b/megaradrp/recipes/calibration/trace.py index 6ea32a1b..557a01c8 100644 --- a/megaradrp/recipes/calibration/trace.py +++ b/megaradrp/recipes/calibration/trace.py @@ -34,7 +34,7 @@ from megaradrp.processing.combine import basic_processing_with_combination from megaradrp.products import TraceMap from megaradrp.products.tracemap import GeometricTrace -from megaradrp.types import ProcessedImage, ProcessedRSS +from megaradrp.ntypes import ProcessedImage, ProcessedRSS from megaradrp.core.recipe import MegaraBaseRecipe import megaradrp.requirements as reqs import megaradrp.products diff --git a/megaradrp/recipes/calibration/twilight.py b/megaradrp/recipes/calibration/twilight.py index 0cc737f7..75ee17b8 100644 --- a/megaradrp/recipes/calibration/twilight.py +++ b/megaradrp/recipes/calibration/twilight.py @@ -22,8 +22,8 @@ import megaradrp.requirements as reqs from megaradrp.core.recipe import MegaraBaseRecipe -from megaradrp.types import MasterTwilightFlat -from megaradrp.types import ProcessedRSS, ProcessedFrame +from megaradrp.ntypes import MasterTwilightFlat +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame # Flat 2D from megaradrp.processing.combine import basic_processing_with_combination from numina.array import combine diff --git a/megaradrp/recipes/combined/extinctionstar.py b/megaradrp/recipes/combined/extinctionstar.py index dd7e7a2c..b189f74f 100644 --- a/megaradrp/recipes/combined/extinctionstar.py +++ b/megaradrp/recipes/combined/extinctionstar.py @@ -13,7 +13,7 @@ from numina.core import Result, Requirement from numina.types.datatype import ListOfType -import megaradrp.types as typs +import megaradrp.ntypes as typs from megaradrp.core.recipe import MegaraBaseRecipe diff --git a/megaradrp/recipes/combined/sensstar.py b/megaradrp/recipes/combined/sensstar.py index 207fb3e4..3ee56d57 100644 --- a/megaradrp/recipes/combined/sensstar.py +++ b/megaradrp/recipes/combined/sensstar.py @@ -14,7 +14,7 @@ from numina.types.datatype import ListOfType from numina.core.requirements import ObservationResultRequirement -import megaradrp.types as typs +import megaradrp.ntypes as typs from megaradrp.core.recipe import MegaraBaseRecipe diff --git a/megaradrp/recipes/scientific/lcb.py b/megaradrp/recipes/scientific/lcb.py index 900dfdfd..9729446e 100644 --- a/megaradrp/recipes/scientific/lcb.py +++ b/megaradrp/recipes/scientific/lcb.py @@ -17,7 +17,7 @@ from numina.core import Result from megaradrp.recipes.scientific.base import ImageRecipe -from megaradrp.types import ProcessedRSS, ProcessedFrame +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame from megaradrp.processing.fluxcalib import FluxCalibration diff --git a/megaradrp/recipes/scientific/lcbfastmapping.py b/megaradrp/recipes/scientific/lcbfastmapping.py index b8035256..a5abbebd 100644 --- a/megaradrp/recipes/scientific/lcbfastmapping.py +++ b/megaradrp/recipes/scientific/lcbfastmapping.py @@ -12,7 +12,7 @@ from numina.core import Product, ObservationResult -from megaradrp.types import ProcessedMultiRSS +from megaradrp.ntypes import ProcessedMultiRSS from megaradrp.core.recipe import MegaraBaseRecipe from megaradrp.processing.multirss import generate_multi_rss diff --git a/megaradrp/recipes/scientific/mos.py b/megaradrp/recipes/scientific/mos.py index 856d5100..0692c98b 100644 --- a/megaradrp/recipes/scientific/mos.py +++ b/megaradrp/recipes/scientific/mos.py @@ -18,7 +18,7 @@ from megaradrp.processing.fluxcalib import FluxCalibration from megaradrp.utils import add_collapsed_mos_extension -from megaradrp.types import ProcessedRSS, ProcessedFrame +from megaradrp.ntypes import ProcessedRSS, ProcessedFrame from .base import ImageRecipe diff --git a/megaradrp/requirements.py b/megaradrp/requirements.py index 13e0190e..4cdd305d 100644 --- a/megaradrp/requirements.py +++ b/megaradrp/requirements.py @@ -12,7 +12,7 @@ from numina.core import Requirement from numina.types.multitype import MultiType -import megaradrp.types +import megaradrp.ntypes import megaradrp.products import megaradrp.products.modelmap @@ -20,7 +20,7 @@ class MasterBiasRequirement(Requirement): def __init__(self, optional=False): super(MasterBiasRequirement, - self).__init__(megaradrp.types.MasterBias, + self).__init__(megaradrp.ntypes.MasterBias, 'Master BIAS image', optional=optional ) @@ -29,7 +29,7 @@ def __init__(self, optional=False): class MasterBPMRequirement(Requirement): def __init__(self, optional=True): super(MasterBPMRequirement, - self).__init__(megaradrp.types.MasterBPM, + self).__init__(megaradrp.ntypes.MasterBPM, 'Master Bad Pixel Mask', optional=optional ) @@ -38,14 +38,14 @@ def __init__(self, optional=True): class MasterDarkRequirement(Requirement): def __init__(self, optional=True): super(MasterDarkRequirement, - self).__init__(megaradrp.types.MasterDark, 'Master DARK image', + self).__init__(megaradrp.ntypes.MasterDark, 'Master DARK image', optional=optional) class MasterFiberFlatRequirement(Requirement): def __init__(self): super(MasterFiberFlatRequirement, - self).__init__(megaradrp.types.MasterFiberFlat, + self).__init__(megaradrp.ntypes.MasterFiberFlat, 'Master fiber flat calibration' ) @@ -53,7 +53,7 @@ def __init__(self): class MasterSlitFlatRequirement(Requirement): def __init__(self, optional=True): super(MasterSlitFlatRequirement, - self).__init__(megaradrp.types.MasterSlitFlat, + self).__init__(megaradrp.ntypes.MasterSlitFlat, 'Master slit flat calibration', optional=optional ) @@ -62,7 +62,7 @@ def __init__(self, optional=True): class MasterTwilightRequirement(Requirement): def __init__(self, optional=True): super(MasterTwilightRequirement, - self).__init__(megaradrp.types.MasterTwilightFlat, + self).__init__(megaradrp.ntypes.MasterTwilightFlat, 'Master twlight flat calibration', optional=optional ) @@ -89,13 +89,13 @@ def __init__(self): class LinesCatalogRequirement(Requirement): def __init__(self): - super(LinesCatalogRequirement, self).__init__(megaradrp.types.MegaraLinesCatalog, 'Catalog of lines') + super(LinesCatalogRequirement, self).__init__(megaradrp.ntypes.MegaraLinesCatalog, 'Catalog of lines') class SkyRSSRequirement(Requirement): def __init__(self, optional=True): super(SkyRSSRequirement, self).__init__( - megaradrp.types.SkyRSS, + megaradrp.ntypes.SkyRSS, 'Row Stacked Spectra of the sky', optional=optional ) @@ -104,7 +104,7 @@ def __init__(self, optional=True): class SensitivityRequirement(Requirement): def __init__(self, optional=True): super(SensitivityRequirement, - self).__init__(megaradrp.types.MasterSensitivity, + self).__init__(megaradrp.ntypes.MasterSensitivity, 'Master sensitivity for flux calibration', optional=optional ) @@ -113,7 +113,7 @@ def __init__(self, optional=True): class ReferenceExtinction(Requirement): def __init__(self, optional=True): super(ReferenceExtinction, - self).__init__(megaradrp.types.ReferenceExtinctionTable, + self).__init__(megaradrp.ntypes.ReferenceExtinctionTable, "Reference extinction", optional=optional ) @@ -122,7 +122,7 @@ def __init__(self, optional=True): class DiffuseLightRequirement(Requirement): def __init__(self, optional=True): super(DiffuseLightRequirement, - self).__init__(megaradrp.types.DiffuseLightCorrection, + self).__init__(megaradrp.ntypes.DiffuseLightCorrection, 'Diffuse light correction image', optional=optional ) diff --git a/megaradrp/tests/test_types.py b/megaradrp/tests/test_ntypes.py similarity index 98% rename from megaradrp/tests/test_types.py rename to megaradrp/tests/test_ntypes.py index 5d74f70d..78fc9947 100644 --- a/megaradrp/tests/test_types.py +++ b/megaradrp/tests/test_ntypes.py @@ -5,7 +5,7 @@ import numina.core import numina.dal from numina.exceptions import NoResultFound -from ..types import MasterFiberFlat +from ..ntypes import MasterFiberFlat from ..products.tracemap import TraceMap