sacc 0.14__tar.gz → 0.15__tar.gz

{sacc-0.14/sacc.egg-info → sacc-0.15}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sacc
-Version: 0.14
+Version: 0.15
 Summary: SACC - the LSST/DESC summary statistic data format library
 Home-page: https://github.com/LSSTDESC/sacc
 Author: LSST DESC

{sacc-0.14 → sacc-0.15}/sacc/sacc.py

@@ -1220,7 +1220,7 @@ class Sacc:
                 raise ValueError("Input bandpowers are misshapen")
             tag_extra = range(window.nv)
             tag_extra_name = "window_ind"
-            window_use = [window for i in range(window.nv)]
+            window_use = [window for _ in range(window.nv)]
         else:
             tag_extra = None
             tag_extra_name = None

{sacc-0.14 → sacc-0.15}/sacc/tracers.py

@@ -305,7 +305,6 @@ class MapTracer(BaseTracer, tracer_type='Map'):
         for table in table_list:
             # Read name and table type
             name = table.meta['SACCNAME']
-            quantity = table.meta.get('SACCQTTY', 'generic')
             tabtyp = table.meta['EXTNAME'].split(':')[-1]
             if tabtyp not in ['beam']:
                 raise KeyError("Unknown table type " + table.meta['EXTNAME'])
@@ -317,7 +316,7 @@ class MapTracer(BaseTracer, tracer_type='Map'):
             tr_tables[name][tabtyp] = table
 
         # Now loop through different tracers and build them from their tables
-        for n, dt in tr_tables.items():
+        for dt in tr_tables.values():
             quantity = []
             metadata = {}
             map_unit = 'none'
@@ -452,7 +451,6 @@ class NuMapTracer(BaseTracer, tracer_type='NuMap'):
         for table in table_list:
             # Read name and table type
             name = table.meta['SACCNAME']
-            quantity = table.meta.get('SACCQTTY', 'generic')
             tabtyp = table.meta['EXTNAME'].split(':')[-1]
             if tabtyp not in ['bandpass', 'beam']:
                 raise KeyError("Unknown table type " + table.meta['EXTNAME'])
@@ -464,7 +462,7 @@ class NuMapTracer(BaseTracer, tracer_type='NuMap'):
             tr_tables[name][tabtyp] = table
 
         # Now loop through different tracers and build them from their tables
-        for n, dt in tr_tables.items():
+        for dt in tr_tables.values():
             quantity = []
             metadata = {}
             nu = []
@@ -652,9 +650,11 @@ class NZTracer(BaseTracer, tracer_type='NZ'):
 
 class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
     """
-    A Tracer type for tomographic n(z) data preresented as a `qp.Ensemble`
+    A Tracer type for tomographic n(z) data represented as a `qp.Ensemble`
+
+    Takes a `qp.Ensemble` and optionally a redshift array.
 
-    Takes a `qp.Ensemble`
+    Requires the `qp` and `tables_io` packages to be installed.
 
     Parameters
     ----------
@@ -666,7 +666,7 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
         The qp.ensemble in questions
     """
 
-    def __init__(self, name, ens, **kwargs):
+    def __init__(self, name, ens, z=None, **kwargs):
         """
         Create a tracer corresponding to a distribution in redshift n(z),
         for example of galaxies.
@@ -680,6 +680,11 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
         ensemble: qp.Ensemble
             The qp.ensemble in questions
 
+        z: array
+            Optional grid of redshift values at which to evaluate the ensemble.
+            If left as None then the ensemble metadata is checked for a grid.
+            If that is not present then no redshift grid is saved.
+
         Returns
         -------
         instance: NZTracer object
@@ -687,7 +692,16 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
         """
         super().__init__(name, **kwargs)
         self.ensemble = ens
-
+        if z is None:
+            ens_meta = ens.metadata()
+            if 'bins' in list(ens_meta.keys()):
+                z = ens_meta['bins'][0]
+        self.z = z
+        if z is None:
+            self.nz = None
+        else:
+            self.nz = np.mean(ens.pdf(self.z),axis=0)
+        
     @classmethod
     def to_tables(cls, instance_list):
         """Convert a list of NZTracers to a list of astropy tables
@@ -710,6 +724,16 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
         tables = []
 
         for tracer in instance_list:
+            if tracer.z is not None:
+                names = ['z', 'nz']
+                cols = [tracer.z, tracer.nz]
+                fid_table = Table(data=cols, names=names)
+                fid_table.meta['SACCTYPE'] = 'tracer'
+                fid_table.meta['SACCCLSS'] = cls.tracer_type
+                fid_table.meta['SACCNAME'] = tracer.name
+                fid_table.meta['SACCQTTY'] = tracer.quantity
+                fid_table.meta['EXTNAME'] = f'tracer:{cls.tracer_type}:{tracer.name}:fid'
+
             table_dict = tracer.ensemble.build_tables()
             ap_tables = convertToApTables(table_dict)
             data_table = ap_tables['data']
@@ -731,6 +755,8 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
                 meta_table.meta['META_'+kk] = vv
             tables.append(data_table)
             tables.append(meta_table)
+            if tracer.z is not None:
+                tables.append(fid_table)
             if ancil_table:
                 ancil_table.meta['SACCTYPE'] = 'tracer'
                 ancil_table.meta['SACCCLSS'] = cls.tracer_type
@@ -761,6 +787,7 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
             Only contains one key/value pair for the one tracer.
         """
         import qp
+
         tracers = {}
         sorted_dict = {}
         for table_ in table_list:
@@ -772,8 +799,12 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
             else:
                 sorted_dict[table_key][table_type] = table_
 
-        for key, val in sorted_dict.items():
+        for val in sorted_dict.values():
             meta_table = val['meta']
+            if 'fid' in val:
+                z = val['fid']['z']
+            else:
+                z = None
             ensemble = qp.from_tables(val)
             name = meta_table.meta['SACCNAME']
             quantity = meta_table.meta.get('SACCQTTY', 'generic')
@@ -782,7 +813,7 @@ class QPNZTracer(BaseTracer, tracer_type='QPNZ'):
             for key, value in meta_table.meta.items():
                 if key.startswith("META_"):
                     metadata[key[5:]] = value
-            tracers[name] = cls(name, ensemble,
+            tracers[name] = cls(name, ensemble, z=z,
                                 quantity=quantity,
                                 metadata=metadata)
         return tracers

{sacc-0.14 → sacc-0.15/sacc.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: sacc
-Version: 0.14
+Version: 0.15
 Summary: SACC - the LSST/DESC summary statistic data format library
 Home-page: https://github.com/LSSTDESC/sacc
 Author: LSST DESC

{sacc-0.14 → sacc-0.15}/test/test_sacc2.py

@@ -833,10 +833,10 @@ def test_qpnz_tracer():
     nz_qp_interp = qp.Ensemble(qp.interp, data=dict(xvals=z, yvals=np.ones(shape=(1, 101))))
     nz_qp_hist = qp.Ensemble(qp.hist, data=dict(bins=z, pdfs=np.ones(shape=(1, 100))))
 
-    T1 = sacc.BaseTracer.make('QPNZ', 'tracer1', nz_qp_interp,
+    T1 = sacc.BaseTracer.make('QPNZ', 'tracer1', nz_qp_interp, z,
                               quantity='galaxy_density',
                               metadata=md1)
-    T2 = sacc.BaseTracer.make('QPNZ', 'tracer2', nz_qp_hist,
+    T2 = sacc.BaseTracer.make('QPNZ', 'tracer2', nz_qp_hist, z,
                               quantity='galaxy_shear',
                               metadata=md2)
     assert T1.metadata == md1
@@ -850,6 +850,15 @@ def test_qpnz_tracer():
     assert T1a.metadata == md1
     assert T2a.metadata == md2
 
+    # test version without saved z
+    T3 = sacc.BaseTracer.make('QPNZ', 'tracer3', nz_qp_interp, 
+                              quantity='galaxy_density',
+                              metadata=md1)
+    tables = sacc.BaseTracer.to_tables([T3])
+    D = sacc.BaseTracer.from_tables(tables)
+    assert D['tracer3'].z is None
+
+
 
 def test_io_qp():
     s = sacc.Sacc()
@@ -859,7 +868,7 @@ def test_io_qp():
     nz = np.expand_dims((z-0.5)**2/0.1**2, 0)
     ens = qp.Ensemble(qp.interp, data=dict(xvals=z, yvals=nz))
     ens.set_ancil(dict(modes = ens.mode(z)))
-    s.add_tracer('QpnZ', 'source_0', ens)
+    s.add_tracer('QpnZ', 'source_0', ens, z)
 
     for i in range(20):
         ee = 0.1 * i