pz-rail-astro-tools 1.1.2__tar.gz → 1.1.3__tar.gz

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pz-rail-astro-tools
-Version: 1.1.2
+Version: 1.1.3
 Author-email: "LSST Dark Energy Science Collaboration (DESC)" <lsst-desc-rail-admin@slac.stanford.edu>
 License: MIT License
         
@@ -39,7 +39,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.2.2
 Requires-Dist: astropy
 Requires-Dist: healpy
-Requires-Dist: photerr
+Requires-Dist: photerr>=1.4.0
 Requires-Dist: dustmaps
 Requires-Dist: pz-hyperbolic-temp
 Requires-Dist: lsstdesc-gcr-catalogs

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/pyproject.toml

@@ -22,7 +22,7 @@ dependencies = [
     "pandas>=2.2.2",
     "astropy",
     "healpy",
-    "photerr",
+    "photerr>=1.4.0",
     "dustmaps",
     "pz-hyperbolic-temp",
     "lsstdesc-gcr-catalogs",

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/src/pz_rail_astro_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pz-rail-astro-tools
-Version: 1.1.2
+Version: 1.1.3
 Author-email: "LSST Dark Energy Science Collaboration (DESC)" <lsst-desc-rail-admin@slac.stanford.edu>
 License: MIT License
         
@@ -39,7 +39,7 @@ Requires-Dist: numpy
 Requires-Dist: pandas>=2.2.2
 Requires-Dist: astropy
 Requires-Dist: healpy
-Requires-Dist: photerr
+Requires-Dist: photerr>=1.4.0
 Requires-Dist: dustmaps
 Requires-Dist: pz-hyperbolic-temp
 Requires-Dist: lsstdesc-gcr-catalogs

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/src/pz_rail_astro_tools.egg-info/requires.txt

@@ -4,7 +4,7 @@ numpy
 pandas>=2.2.2
 astropy
 healpy
-photerr
+photerr>=1.4.0
 dustmaps
 pz-hyperbolic-temp
 lsstdesc-gcr-catalogs

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/src/rail/astro_tools/_version.py

@@ -17,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.2'
-__version_tuple__ = version_tuple = (1, 1, 2)
+__version__ = version = '1.1.3'
+__version_tuple__ = version_tuple = (1, 1, 3)

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/src/rail/creation/degraders/photometric_errors.py

@@ -12,8 +12,23 @@ from photerr import LsstErrorModel as peLsstErrorModel
 from photerr import LsstErrorParams as peLsstErrorParams
 from photerr import RomanErrorModel as peRomanErrorModel
 from photerr import RomanErrorParams as peRomanErrorParams
+
+from photerr import RomanWideErrorModel as peRomanWideErrorModel
+from photerr import RomanWideErrorParams as peRomanWideErrorParams
+from photerr import RomanMediumErrorModel as peRomanMediumErrorModel
+from photerr import RomanMediumErrorParams as peRomanMediumErrorParams
+from photerr import RomanDeepErrorModel as peRomanDeepErrorModel
+from photerr import RomanDeepErrorParams as peRomanDeepErrorParams
+from photerr import RomanUltraDeepErrorModel as peRomanUltraDeepErrorModel
+from photerr import RomanUltraDeepErrorParams as peRomanUltraDeepErrorParams
+
 from photerr import EuclidErrorModel as peEuclidErrorModel
 from photerr import EuclidErrorParams as peEuclidErrorParams
+from photerr import EuclidWideErrorModel as peEuclidWideErrorModel
+from photerr import EuclidWideErrorParams as peEuclidWideErrorParams
+from photerr import EuclidDeepErrorModel as peEuclidDeepErrorModel
+from photerr import EuclidDeepErrorParams as peEuclidDeepErrorParams
+
 from rail.creation.noisifier import Noisifier
 
 class PhotoErrorModel(Noisifier):
@@ -132,12 +147,79 @@ class RomanErrorModel(PhotoErrorModel):
         self.reload_pars(args)
         self.peNoiseModel = peRomanErrorModel
 
-                
+
+class RomanWideErrorModel(PhotoErrorModel):
+    
+    """
+    The Roman WideError model, defined by peRomanWideErrorParams and peRomanWideErrorModel
+    """
+    
+    name = "RomanWideErrorModel"
+    
+    def __init__(self, args, **kwargs):
+
+        super().__init__(args, **kwargs)
+        
+        self.set_params(peRomanWideErrorParams)    
+        self.reload_pars(args)
+        self.peNoiseModel = peRomanWideErrorModel
+
+        
+class RomanMediumErrorModel(PhotoErrorModel):
+    
+    """
+    The Roman Medium Error model, defined by peRomanMediumErrorParams and peRomanMediumErrorModel
+    """
+    
+    name = "RomanMediumErrorModel"
+    
+    def __init__(self, args, **kwargs):
+
+        super().__init__(args, **kwargs)
+        
+        self.set_params(peRomanMediumErrorParams)    
+        self.reload_pars(args)
+        self.peNoiseModel = peRomanMediumErrorModel
+
+        
+class RomanDeepErrorModel(PhotoErrorModel):
+    
+    """
+    The Roman Deep Error model, defined by peRomanDeepErrorParams and peRomanDeepErrorModel
+    """
+    
+    name = "RomanDeepErrorModel"
+    
+    def __init__(self, args, **kwargs):
+
+        super().__init__(args, **kwargs)
+        
+        self.set_params(peRomanDeepErrorParams)    
+        self.reload_pars(args)
+        self.peNoiseModel = peRomanDeepErrorModel
+
+
+class RomanUltraDeepErrorModel(PhotoErrorModel):
+    
+    """
+    The Roman UltraDeep Error model, defined by peRomanUltraDeepErrorParams and peRomanUltraDeepErrorModel
+    """
+    
+    name = "RomanUltraDeepErrorModel"
+    
+    def __init__(self, args, **kwargs):
+
+        super().__init__(args, **kwargs)
+        
+        self.set_params(peRomanUltraDeepErrorParams)    
+        self.reload_pars(args)
+        self.peNoiseModel = peRomanUltraDeepErrorModel
+
         
 class EuclidErrorModel(PhotoErrorModel):
     
     """
-    The Roman Error model, defined by peRomanErrorParams and peRomanErrorModel
+    The Euclid Error model, defined by peEuclidErrorParams and peEuclidErrorModel
     """
     
     name = "EuclidErrorModel"
@@ -149,3 +231,39 @@ class EuclidErrorModel(PhotoErrorModel):
         self.set_params(peEuclidErrorParams)    
         self.reload_pars(args)
         self.peNoiseModel = peEuclidErrorModel
+
+
+class EuclidWideErrorModel(PhotoErrorModel):
+    
+    """
+    The Euclid Wide Error model, defined by peEuclidWideErrorParams and peEuclidWideErrorModel
+    """
+    
+    name = "EuclidWideErrorModel"
+    
+    def __init__(self, args, **kwargs):
+
+        super().__init__(args, **kwargs)
+        
+        self.set_params(peEuclidWideErrorParams)    
+        self.reload_pars(args)
+        self.peNoiseModel = peEuclidWideErrorModel
+
+
+class EuclidDeepErrorModel(PhotoErrorModel):
+    
+    """
+    The Euclid Deep Error model, defined by peEuclidDeepErrorParams and peEuclidDeepErrorModel
+    """
+    
+    name = "EuclidDeepErrorModel"
+    
+    def __init__(self, args, **kwargs):
+
+        super().__init__(args, **kwargs)
+        
+        self.set_params(peEuclidDeepErrorParams)    
+        self.reload_pars(args)
+        self.peNoiseModel = peEuclidDeepErrorModel
+
+        

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/src/rail/pipelines/degradation/apply_phot_errors.py

@@ -56,8 +56,7 @@ class ApplyPhotErrorsPipeline(RailPipeline):
         self.reddener = Reddener.build(
             dustmap_dir=dustmap_dir,
             copy_all_cols=True,
-        )
-
+        )        
         previous_stage = self.reddener
         full_rename_dict = catalog_utils.CatalogConfigBase.active_class().band_name_dict()
         for key, val in error_models.items():
@@ -71,6 +70,9 @@ class ApplyPhotErrorsPipeline(RailPipeline):
                 connections=dict(input=previous_stage.io.output),
                 hdf5_groupname='',
                 renameDict=rename_dict,
+                minorCol='minor',
+                majorCol='major',
+                extendedType='gaap',
             )
             self.add_stage(the_error_model)
             previous_stage = the_error_model

{pz_rail_astro_tools-1.1.2 → pz_rail_astro_tools-1.1.3}/tests/astro_tools/test_degraders.py

@@ -13,7 +13,7 @@ from rail.creation.degraders.spectroscopic_degraders import InvRedshiftIncomplet
 from rail.creation.degraders.spectroscopic_selections import *
 from rail.creation.degraders.observing_condition_degrader import ObsCondition
 from rail.creation.degraders.grid_selection import GridSelection
-from rail.creation.degraders.photometric_errors import EuclidErrorModel, LSSTErrorModel
+from rail.creation.degraders.photometric_errors import *
 from rail.creation.degraders.unrec_bl_model import UnrecBlModel
 
 
@@ -414,9 +414,23 @@ def test_LSSTErrorModel_returns_correct_columns(data):
     os.remove(degrader.get_output(degrader.get_aliased_tag("output"), final_name=True))
 
 
-def test_EucliErrorModel(data):
+@pytest.mark.parametrize(
+    "error_model_class",
+    [
+        (RomanErrorModel),
+        (RomanWideErrorModel),
+        (RomanMediumErrorModel),
+        (RomanDeepErrorModel),
+        (RomanUltraDeepErrorModel),
+        (EuclidErrorModel),
+        (EuclidWideErrorModel),
+        (EuclidDeepErrorModel),
+    ]
+)
+def test_error_models(data, error_model_class):
     # Setup the stage
-    degrader = EuclidErrorModel.make_stage()
+    degrader = error_model_class.make_stage()
+    assert degrader
 
 
 def test_BLModel(data_for_bl):