pz-rail-astro-tools 1.1.1__py3-none-any.whl → 1.1.3__py3-none-any.whl

{pz_rail_astro_tools-1.1.1.dist-info → pz_rail_astro_tools-1.1.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pz-rail-astro-tools
-Version: 1.1.1
+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
@@ -50,6 +50,7 @@ Requires-Dist: pytest; extra == "dev"
 Requires-Dist: pytest-cov; extra == "dev"
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: pylint; extra == "dev"
+Dynamic: license-file
 
 # pz-rail-astro-tools
 

{pz_rail_astro_tools-1.1.1.dist-info → pz_rail_astro_tools-1.1.3.dist-info}/RECORD

@@ -1,8 +1,9 @@
+pz_rail_astro_tools-1.1.3.dist-info/licenses/LICENSE,sha256=tLMEN21HbzvT-7umOVVvPjaJZbQxCa-2bAeYLwG5Q04,1102
 rail/astro_tools/__init__.py,sha256=4J-E0Ug0RP3Y38g8kJ6auAPDPEI4Osf19tuSOAACfxk,432
-rail/astro_tools/_version.py,sha256=EPoWF0em1tKJgBz5dbBF-r29860VBk-SsdiXh6E1aO0,411
+rail/astro_tools/_version.py,sha256=NZq8o7CvDHjsuTdJBIlk-waJ8gpJ6NCKjeYt9lufMC4,511
 rail/creation/degraders/grid_selection.py,sha256=d42-7lvcCKhV6LlvCMwVV7Lp05Y0Q2xlMTwS99MeYRk,12506
 rail/creation/degraders/observing_condition_degrader.py,sha256=IflXSlcAyEMqNKDqGL78lSJSXH2rqB8mVDDVLI4loMM,19961
-rail/creation/degraders/photometric_errors.py,sha256=jx7JL5-lzKm6IbNTYwHqkEeGZduXC59Tad2UNwEJWlc,4703
+rail/creation/degraders/photometric_errors.py,sha256=g4eP8wu-KB6SaySzOnIMMKDEUbAcfNKklgdMfETH5jE,8164
 rail/creation/degraders/spectroscopic_degraders.py,sha256=tsB9jvqEXCgDPw66A1kWjBQn_Nm743XOewEzDympBsI,4701
 rail/creation/degraders/spectroscopic_selections.py,sha256=U37m0uc7yFohYzAcxl6LM-oYK9ziD894Y0xwBSvEUhY,21207
 rail/creation/degraders/unrec_bl_model.py,sha256=E89DVV67FcHozCjtUz4ty3Ak3q8H9lnNnh5wNWi_R8M,7476
@@ -14,13 +15,12 @@ rail/examples_data/creation_data/data/survey_conditions/DC2-mask-neg-nside-128.f
 rail/examples_data/creation_data/data/survey_conditions/minion_1016_dc2_Median_airmass_i_and_nightlt1825_HEAL.fits,sha256=twvyce70G3h1MQnGGFQJG9wZc8UbuNqXc6mjtiuaL1s,1581120
 rail/examples_data/creation_data/data/survey_conditions/minion_1016_dc2_Median_fiveSigmaDepth_i_and_nightlt1825_HEAL.fits,sha256=RbMMFSVJQxGhZnL4BnISE9VTNljfTZwV6Bax6NxverY,1581120
 rail/examples_data/testdata/rubin_dm_dc2_example2.pq,sha256=_Iihbbcz1A332QAkaMiFacT4QAbBQBMTOwpfrS7AclE,25884
-rail/pipelines/degradation/apply_phot_errors.py,sha256=E6H1Qza1IkO9VWqqxeny6MYkw3gURWscwKxzgUHEOko,2087
+rail/pipelines/degradation/apply_phot_errors.py,sha256=UIQ0eWq59RT1e2S2-1zPnhtfGKOxL1gai9h7crhoK0w,2530
 rail/pipelines/degradation/blending.py,sha256=oxZHy1Tai70wT4g4xnBr24z2LxmR1p_J6lMoTN0nFc8,564
 rail/pipelines/degradation/spectroscopic_selection_pipeline.py,sha256=D0sDi6nrasv5CvQkLXgmMp0QbDrhGFRXzt6sWjlbD68,2028
-rail/pipelines/degradation/truth_to_observed.py,sha256=nfzMKdZd69_P1HnHy56UcjMUpFdRHf6g55oNhlW5Gzg,2995
-rail/tools/photometry_tools.py,sha256=wfKAeMz5T_CYDPC661MHtU1aJXVqomvahZl87KuE7uY,19541
-pz_rail_astro_tools-1.1.1.dist-info/LICENSE,sha256=tLMEN21HbzvT-7umOVVvPjaJZbQxCa-2bAeYLwG5Q04,1102
-pz_rail_astro_tools-1.1.1.dist-info/METADATA,sha256=U1a5-4mu3t6ywblIHDKllC777jtmzEBRXeRXbIVDDs8,4033
-pz_rail_astro_tools-1.1.1.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-pz_rail_astro_tools-1.1.1.dist-info/top_level.txt,sha256=6R6sqn-85I8YZTzmB9gv7sqckB2QaOTHbu-QLGTWBRE,5
-pz_rail_astro_tools-1.1.1.dist-info/RECORD,,
+rail/pipelines/degradation/truth_to_observed.py,sha256=jJx8GOqO-0aWYedrq4h3zHHEn8w_steY0LQ6xzDdHiE,3178
+rail/tools/photometry_tools.py,sha256=zszTH_8KEk0UiQywKSsL2ZImGQL6UCzFYMrqsWFGdrc,19597
+pz_rail_astro_tools-1.1.3.dist-info/METADATA,sha256=2au1Llyaxox_vjiZov1BavKOeZiwCh0B7IrseMYfEG0,4062
+pz_rail_astro_tools-1.1.3.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+pz_rail_astro_tools-1.1.3.dist-info/top_level.txt,sha256=6R6sqn-85I8YZTzmB9gv7sqckB2QaOTHbu-QLGTWBRE,5
+pz_rail_astro_tools-1.1.3.dist-info/RECORD,,

{pz_rail_astro_tools-1.1.1.dist-info → pz_rail_astro_tools-1.1.3.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.8.0)
+Generator: setuptools (80.0.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

rail/astro_tools/_version.py

@@ -1,8 +1,13 @@
-# file generated by setuptools_scm
+# file generated by setuptools-scm
 # don't change, don't track in version control
+
+__all__ = ["__version__", "__version_tuple__", "version", "version_tuple"]
+
 TYPE_CHECKING = False
 if TYPE_CHECKING:
-    from typing import Tuple, Union
+    from typing import Tuple
+    from typing import Union
+
     VERSION_TUPLE = Tuple[Union[int, str], ...]
 else:
     VERSION_TUPLE = object
@@ -12,5 +17,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.1.1'
-__version_tuple__ = version_tuple = (1, 1, 1)
+__version__ = version = '1.1.3'
+__version_tuple__ = version_tuple = (1, 1, 3)

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
+
+        

rail/pipelines/degradation/apply_phot_errors.py

@@ -25,11 +25,13 @@ ERROR_MODELS = dict(
     lsst = dict(
         ErrorModel='LSSTErrorModel',
         Module='rail.creation.degraders.photometric_errors',
+        Bands=['u', 'g', 'r', 'i', 'z', 'y'],
     ),
-    roman = dict(
-        ErrorModel='RomanErrorModel',
-        Module='rail.creation.degraders.photometric_errors',
-    ),
+    #roman = dict(
+    #    ErrorModel='RomanErrorModel',
+    #    Module='rail.creation.degraders.photometric_errors',
+    #    Bands=['Y', 'J', 'H', 'F'],
+    #),
     #euclid = dict(
     #    ErrorModel='EuclidErrorModel',
     #    Module='rail.creation.degraders.photometric_errors',
@@ -54,16 +56,23 @@ 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():
             error_model_class = ceci.PipelineStage.get_stage(val['ErrorModel'], val['Module'])
+            if 'Bands' in val:
+                rename_dict = {band_: full_rename_dict[band_] for band_ in val['Bands']}
+            else:  # pragma: no cover
+                rename_dict = full_rename_dict
             the_error_model = error_model_class.make_and_connect(
                 name=f'error_model_{key}',
                 connections=dict(input=previous_stage.io.output),
                 hdf5_groupname='',
-                renameDict=catalog_utils.CatalogConfigBase.active_class().band_name_dict(),
+                renameDict=rename_dict,
+                minorCol='minor',
+                majorCol='major',
+                extendedType='gaap',
             )
             self.add_stage(the_error_model)
             previous_stage = the_error_model

rail/pipelines/degradation/truth_to_observed.py

@@ -37,7 +37,7 @@ class TruthToObservedPipeline(RailPipeline):
         DS.__class__.allow_overwrite = True
 
         active_catalog_config = catalog_utils.CatalogConfigBase.active_class()
-        band_name_dict = active_catalog_config.band_name_dict()
+        full_rename_dict = active_catalog_config.band_name_dict()
 
         if error_models is None:
             error_models = ERROR_MODELS.copy()
@@ -46,7 +46,7 @@ class TruthToObservedPipeline(RailPipeline):
             selectors = SELECTORS.copy()
 
         config_pars = CommonConfigParams.copy()
-        config_pars['colnames'] = band_name_dict.copy()
+        config_pars['colnames'] = full_rename_dict.copy()
         config_pars['colnames']['redshift'] = active_catalog_config.redshift_col
 
         self.reddener = Reddener.build(
@@ -61,11 +61,16 @@ class TruthToObservedPipeline(RailPipeline):
 
         for key, val in error_models.items():
             error_model_class = ceci.PipelineStage.get_stage(val['ErrorModel'], val['Module'])
+            if 'Bands' in val:
+                rename_dict = {band_: full_rename_dict[band_] for band_ in val['Bands']}
+            else:  # pragma: no cover
+                rename_dict = full_rename_dict
+
             the_error_model = error_model_class.make_and_connect(
                 name=f'error_model_{key}',
                 connections=dict(input=previous_stage.io.output),
                 hdf5_groupname='',
-                renameDict=band_name_dict,
+                renameDict=rename_dict,
             )
             self.add_stage(the_error_model)
             previous_stage = the_error_model
@@ -78,12 +83,12 @@ class TruthToObservedPipeline(RailPipeline):
             )
             self.add_stage(dereddener_errors)
             previous_stage = dereddener_errors
-            
+
             for key2, val2 in selectors.items():
                 the_class = ceci.PipelineStage.get_stage(val2['Select'], val2['Module'])
                 the_selector = the_class.make_and_connect(
                     name=f'select_{key}_{key2}',
                     connections=dict(input=previous_stage.io.output),
                     **config_pars,
-                )            
+                )
                 self.add_stage(the_selector)

rail/tools/photometry_tools.py

@@ -371,10 +371,11 @@ class LSSTFluxToMagConverter(RailStage):
     mag_conv = np.log(10)*0.4
 
     inputs = [('input', PqHandle)]
-    outputs = [('output', Hdf5Handle)]
+    outputs = [('output', PqHandle)]
 
     def _flux_to_mag(self, flux_vals):
-        return -2.5*np.log10(flux_vals) + self.config.mag_offset
+        vals = -2.5*np.log10(flux_vals) + self.config.mag_offset
+        return np.where(np.isfinite(vals), vals, np.nan)
 
     def _flux_err_to_mag_err(self, flux_vals, flux_err_vals):
         return flux_err_vals / (flux_vals*self.mag_conv)
@@ -383,6 +384,7 @@ class LSSTFluxToMagConverter(RailStage):
         data = self.get_data('input', allow_missing=True)
         out_data = {}
         const = np.log(10.)*0.4
+
         for band_ in self.config.bands:
             flux_col_name = self.config.flux_name.format(band=band_)
             flux_err_col_name = self.config.flux_err_name.format(band=band_)