Rename module types to ntypes (fixes #286)

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],

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

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):

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
 
 

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

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

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')

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
 
 

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
 
 

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
 
 

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

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):

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

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):

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
 

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

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

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
 
 

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
 
 

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
 
 

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
 

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
 
 

megaradrp/requirements.py

@@ -12,15 +12,15 @@
 from numina.core import Requirement
 from numina.types.multitype import MultiType
 
-import megaradrp.types
+import megaradrp.ntypes
 import megaradrp.products
 import megaradrp.products.modelmap
 
 
 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,22 +38,22 @@ 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'
                              )
 
 
 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
                              )

megaradrp/tests/test_types.py → 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