pz-rail-astro-tools 1.0.7__tar.gz → 1.0.8__tar.gz

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pz-rail-astro-tools
-Version: 1.0.7
+Version: 1.0.8
 Author-email: "LSST Dark Energy Science Collaboration (DESC)" <lsst-desc-rail-admin@slac.stanford.edu>
 License: MIT License
         

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/src/pz_rail_astro_tools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: pz-rail-astro-tools
-Version: 1.0.7
+Version: 1.0.8
 Author-email: "LSST Dark Energy Science Collaboration (DESC)" <lsst-desc-rail-admin@slac.stanford.edu>
 License: MIT License
         

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/src/rail/astro_tools/_version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.0.7'
-__version_tuple__ = version_tuple = (1, 0, 7)
+__version__ = version = '1.0.8'
+__version_tuple__ = version_tuple = (1, 0, 8)

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/src/rail/creation/degraders/photometric_errors.py

@@ -47,21 +47,27 @@ class PhotoErrorModel(Noisifier):
                 default = val.default
                 
             # Add this param to config_options
-            self.config[key] = Param(
+            # Use setattr() becuase ceci.StageConfig has
+            # implemented __setitem__ to just set the value
+            # rather than add the parameters
+            param = Param(
                 None,  # Let PhotErr handle type checking
                 default,  
                 msg="See the main docstring for details about this parameter.",
                 required=False,
             )
+            setattr(self.config, key, param)
 
     def reload_pars(self, args):
         """ This is needed b/c the parameters are dynamically defined, 
         so we have to reload them _after_ then have been defined """
-        copy_args = args.copy()
         if isinstance(args, dict):
+            # coming from python, add 'config' to the configuration
+            copy_args = args.copy()
             copy_args['config'] = args
         else:  # pragma: no cover
-            copy_args['config'] = vars(args)            
+            # coming from cli, just convert to a dict
+            copy_args = vars(args).copy()
         self.load_configs(copy_args)
         self._io_checked = False
         self.check_io()

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/src/rail/creation/degraders/unrec_bl_model.py

@@ -8,6 +8,8 @@ import numpy as np, pandas as pd
 import FoFCatalogMatching
 
 
+lsst_zp_dict = {'u':12.65, 'g':14.69, 'r':14.56, 'i': 14.38, 'z':13.99, 'y': 13.02}
+
 class UnrecBlModel(Degrader):
     """Model for Creating Unrecognized Blends.
 
@@ -22,6 +24,7 @@ class UnrecBlModel(Degrader):
                           dec_label=Param(str, 'dec', msg='dec column name'),
                           linking_lengths=Param(float, 1.0, msg='linking_lengths for FoF matching'),
                           bands=SHARED_PARAMS,
+                          zp_dict=Param(dict, lsst_zp_dict, msg='magnitude zeropoints dictionary'),
                           ref_band=SHARED_PARAMS,
                           redshift_col=SHARED_PARAMS,
                           match_size=Param(bool, False, msg='consider object size for finding blends'),
@@ -99,17 +102,18 @@ class UnrecBlModel(Degrader):
         unique_id = np.unique(group_id)
 
         ra_label, dec_label = self.config.ra_label, self.config.dec_label
-        cols = [ra_label, dec_label] + [b for b in self.config.bands] + self.blend_info_cols
+        cols = [ra_label, dec_label] + [b for b in self.config.bands] + [self.config.redshift_col] + self.blend_info_cols
 
         N_rows = len(unique_id)
         N_cols = len(cols)
 
         # compute the fluxes once for all the galaxies
-        fluxes = {b:10**(-data[b]/2.5) for b in self.config.bands}
+        fluxes = {b:10**(-(data[b] - self.config.zp_dict[b])/2.5) for b in self.config.bands}
 
         # pull the column indices
         idx_ra = cols.index(ra_label)
         idx_dec = cols.index(dec_label)
+        idx_redshift = cols.index(self.config.redshift_col)
         idx_n_obj = cols.index('n_obj')
         idx_brightest_flux = cols.index('brightest_flux')
         idx_total_flux = cols.index('total_flux')
@@ -139,14 +143,16 @@ class UnrecBlModel(Degrader):
 
             ## sum up the fluxes into the blended source
             for b in self.config.bands:
-                mergeData[i, cols.index(b)] = -2.5*np.log10(np.sum(these_fluxes[b]))
+                mergeData[i, cols.index(b)] = -2.5*np.log10(np.sum(these_fluxes[b])) + self.config.zp_dict[b]
 
             brighest_idx = np.argmax(ref_fluxes)
+            redshifts = these_redshifts.iloc[brighest_idx]
 
+            mergeData[i, idx_redshift] = redshifts
             mergeData[i, idx_n_obj] = n_obj
             mergeData[i, idx_brightest_flux] = ref_fluxes.max()
             mergeData[i, idx_total_flux] = np.sum(ref_fluxes)
-            mergeData[i, idx_z_brightest] = these_redshifts.iloc[brighest_idx]
+            mergeData[i, idx_z_brightest] = redshifts
             mergeData[i, idx_z_mean] = np.mean(these_redshifts)
             mergeData[i, idx_z_weighted] = np.sum(these_redshifts*ref_fluxes)/np.sum(ref_fluxes)
             if n_obj > 1:

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/src/rail/pipelines/degradation/apply_phot_errors.py

@@ -13,6 +13,7 @@ from rail.core.stage import RailStage, RailPipeline
 import ceci
 
 from rail.core.utils import RAILDIR
+from rail.utils import catalog_utils
 
 if 'PZ_DUSTMAP_DIR' not in os.environ:
     os.environ['PZ_DUSTMAP_DIR'] = '.'
@@ -62,6 +63,7 @@ class ApplyPhotErrorsPipeline(RailPipeline):
                 name=f'error_model_{key}',
                 connections=dict(input=previous_stage.io.output),
                 hdf5_groupname='',
+                renameDict=catalog_utils.CatalogConfigBase.active_class().band_name_dict(),
             )
             self.add_stage(the_error_model)
             previous_stage = the_error_model

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/src/rail/pipelines/degradation/truth_to_observed.py

@@ -13,7 +13,7 @@ from rail.core.stage import RailStage, RailPipeline
 import ceci
 
 from rail.core.utils import RAILDIR
-
+from rail.utils import catalog_utils
 from rail.creation.degraders.unrec_bl_model import UnrecBlModel
 
 from .spectroscopic_selection_pipeline import SELECTORS, CommonConfigParams
@@ -36,6 +36,9 @@ class TruthToObservedPipeline(RailPipeline):
         DS = RailStage.data_store
         DS.__class__.allow_overwrite = True
 
+        active_catalog_config = catalog_utils.CatalogConfigBase.active_class()
+        band_name_dict = active_catalog_config.band_name_dict()
+
         if error_models is None:
             error_models = ERROR_MODELS.copy()
 
@@ -43,6 +46,8 @@ class TruthToObservedPipeline(RailPipeline):
             selectors = SELECTORS.copy()
 
         config_pars = CommonConfigParams.copy()
+        config_pars['colnames'] = band_name_dict.copy()
+        config_pars['colnames']['redshift'] = active_catalog_config.redshift_col
 
         self.reddener = Reddener.build(
             dustmap_dir=dustmap_dir,
@@ -60,6 +65,7 @@ class TruthToObservedPipeline(RailPipeline):
                 name=f'error_model_{key}',
                 connections=dict(input=previous_stage.io.output),
                 hdf5_groupname='',
+                renameDict=band_name_dict,
             )
             self.add_stage(the_error_model)
             previous_stage = the_error_model

{pz_rail_astro_tools-1.0.7 → pz_rail_astro_tools-1.0.8}/tests/astro_tools/test_degraders.py

@@ -429,6 +429,7 @@ def test_BLModel(data_for_bl):
         linking_lengths=1.0,
         bands='ugrizy',
         ref_band='i',
+	redshift_col='redshift',
         seed=1234)
 
     # Apply the degrader and get the data out