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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pz-rail-astro-tools
-Version: 1.1.1
+Version: 1.1.2
 Author-email: "LSST Dark Energy Science Collaboration (DESC)" <lsst-desc-rail-admin@slac.stanford.edu>
 License: MIT License
         
@@ -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 → pz_rail_astro_tools-1.1.2}/src/pz_rail_astro_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: pz-rail-astro-tools
-Version: 1.1.1
+Version: 1.1.2
 Author-email: "LSST Dark Energy Science Collaboration (DESC)" <lsst-desc-rail-admin@slac.stanford.edu>
 License: MIT License
         
@@ -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 → pz_rail_astro_tools-1.1.2}/src/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.2'
+__version_tuple__ = version_tuple = (1, 1, 2)

{pz_rail_astro_tools-1.1.1 → pz_rail_astro_tools-1.1.2}/src/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',
@@ -57,13 +59,18 @@ class ApplyPhotErrorsPipeline(RailPipeline):
         )
 
         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,
             )
             self.add_stage(the_error_model)
             previous_stage = the_error_model

{pz_rail_astro_tools-1.1.1 → pz_rail_astro_tools-1.1.2}/src/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)

{pz_rail_astro_tools-1.1.1 → pz_rail_astro_tools-1.1.2}/src/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_)