U/jrbogart/remove sncosmo

cfg/object_types.yaml

@@ -66,7 +66,7 @@ object_types :
       internal_extinction: CCM
       MW_extinction: F19
       spatial_model:  knots
-      
+
   star:
       file_template: 'pointsource_(?P<healpix>\d+).parquet'
       flux_file_template: 'pointsource_flux_(?P<healpix>\d+).parquet'
@@ -77,15 +77,6 @@ object_types :
       sed_file_root_env_var: SIMS_SED_LIBRARY_DIR
       MW_extinction: F19
       internal_extinction: None
-  sncosmo:
-      file_template: 'pointsource_(?P<healpix>\d+).parquet'
-      data_file_type: parquet
-      area_partition:
-        { type: healpix, ordering: ring, nside: 32}
-
-      sed_model: sncosmo
-      MW_extinction: F19
-      internal_extinction: None
   gaia_star:
       data_file_type: butler_refcat
       butler_parameters:

etc/conda_requirements.txt

@@ -2,4 +2,4 @@
 
 stackvana>=0.2023.32
 gitpython
-sncosmo
+# sncosmo

pyproject.toml

@@ -19,7 +19,6 @@ dependencies = [
     'astropy',
     'pyarrow',
     'pandas',
-    'sncosmo',
 ]
 requires-python = ">=3.7" # For setuptools >= 61.0 support
 

skycatalogs/data/ci_sample/skyCatalog.yaml

@@ -129,7 +129,6 @@ object_types:
 provenance:
   inputs:
     galaxy_truth: cosmodc2_v1.1.4_image_addon_knots
-    sn_truth: /global/cfs/cdirs/lsst/groups/SSim/DC2/cosmoDC2_v1.1.4/sne_cosmoDC2_v1.1.4_MS_DDF_healpix.db
     star_truth: /global/cfs/cdirs/lsst/groups/SSim/DC2/dc2_stellar_healpixel.db
   skyCatalogs_repo:
     git_branch: master

skycatalogs/data/ci_sample/skyCatalog_top.yaml

@@ -94,7 +94,6 @@ object_types:
 provenance:
   inputs:
     galaxy_truth: cosmodc2_v1.1.4_image_addon_knots
-    sn_truth: /global/cfs/cdirs/lsst/groups/SSim/DC2/cosmoDC2_v1.1.4/sne_cosmoDC2_v1.1.4_MS_DDF_healpix.db
     star_truth: /global/cfs/cdirs/lsst/groups/SSim/DC2/dc2_stellar_healpixel.db
   skyCatalogs_repo:
     git_branch: master

skycatalogs/skyCatalogs.py

@@ -12,15 +12,13 @@
 from skycatalogs.objects.gaia_object import GaiaObject, GaiaCollection
 from skycatalogs.objects.sso_object import SsoObject, SsoCollection
 from skycatalogs.objects.sso_object import EXPOSURE_DEFAULT
-# from skycatalogs.objects.sso_object import find_sso_files
 from skycatalogs.readers import ParquetReader
 from skycatalogs.utils.sed_tools import TophatSedFactory, DiffskySedFactory
 from skycatalogs.utils.sed_tools import SsoSedFactory
 from skycatalogs.utils.sed_tools import MilkyWayExtinction
 from skycatalogs.utils.config_utils import Config
 from skycatalogs.utils.shapes import Box, Disk, PolygonalRegion
 from skycatalogs.utils.shapes import compute_region_mask
-from skycatalogs.objects.sncosmo_object import SncosmoObject, SncosmoCollection
 from skycatalogs.objects.star_object import StarObject
 from skycatalogs.objects.galaxy_object import GalaxyObject
 from skycatalogs.objects.diffsky_object import DiffskyObject
@@ -347,11 +345,6 @@ def __init__(self, config, mp=False, skycatalog_root=None, verbose=False,
                                               object_class=GaiaObject,
                                               collection_class=GaiaCollection,
                                               custom_load=True)
-        if 'sncosmo' in config['object_types']:
-            self.cat_cxt.register_source_type(
-                'sncosmo',
-                object_class=SncosmoObject,
-                collection_class=SncosmoCollection)
         if 'star' in config['object_types']:
             self.cat_cxt.register_source_type('star',
                                               object_class=StarObject)
@@ -660,7 +653,7 @@ def get_object_type_by_hp(self, hp, object_type, region=None, mjd=None,
         elif object_type in ['snana']:
             columns = ['id', 'ra', 'dec', 'start_mjd', 'end_mjd']
             id_name = 'id'
-        elif object_type in ['star', 'sncosmo']:
+        elif object_type in ['star']:
             columns = ['object_type', 'id', 'ra', 'dec']
             id_name = 'id'
         elif object_type in ['sso']:
@@ -810,4 +803,4 @@ def open_catalog(config_file, mp=False, skycatalog_root=None, verbose=False):
 
     config_dict = open_config_file(config_file)
     return SkyCatalog(config_dict, skycatalog_root=skycatalog_root, mp=mp,
-                      verbose=verbose)
+                      verbose=verbose)

skycatalogs/utils/__init__.py

@@ -4,6 +4,5 @@
 from .exceptions import *
 from .parquet_schema_utils import *
 from .sed_tools import *
-from .sn_tools import *
 from .shapes import *
 from .creator_utils import *

skycatalogs/utils/parquet_schema_utils.py

@@ -2,7 +2,7 @@
 import logging
 
 __all__ = ['make_galaxy_schema', 'make_galaxy_flux_schema',
-           'make_pointsource_schema', 'make_star_flux_schema']
+           'make_star_schema', 'make_star_flux_schema']
 
 
 def _add_roman_fluxes(fields):
@@ -140,19 +140,10 @@ def make_star_flux_schema(logname, include_roman_flux=False):
     return pa.schema(fields)
 
 
-def make_pointsource_schema():
+def make_star_schema():
     '''
-    Ultimately should handle stars both static and variable, SN, and AGN
-    For now add everything needed for SN and put in some additional
-    star fields, but not structs for star variability models
+    Just for "regular" stars.
     '''
-
-    salt2_fields = [
-        pa.field('z', pa.float64(), True),
-        pa.field('t0', pa.float64(), True),
-        pa.field('x0', pa.float64(), True),
-        pa.field('x1', pa.float64(), True),
-        pa.field('c', pa.float64(), True)]
     fields = [pa.field('object_type', pa.string(), False),
               pa.field('id', pa.string(), False),
               pa.field('ra', pa.float64(), False),
@@ -167,28 +158,5 @@ def make_pointsource_schema():
               pa.field('radial_velocity', pa.float64(), True),
               pa.field('parallax', pa.float64(), True),
               pa.field('variability_model', pa.string(), True),
-              pa.field('salt2_params', pa.struct(salt2_fields), True)
               ]
     return pa.schema(fields)
-
-
-def make_pointsource_flux_schema(logname, include_roman_flux=False):
-    '''
-    Will make a separate parquet file with lsst flux for each band
-    and id for joining with the main star file.
-    For static sources mjd field could be -1. Or the field could be
-    made nullable.
-    '''
-    logger = logging.getLogger(logname)
-    logger.debug('Creating pointsource flux schema')
-    fields = [pa.field('id', pa.string()),
-              pa.field('lsst_flux_u', pa.float32(), True),
-              pa.field('lsst_flux_g', pa.float32(), True),
-              pa.field('lsst_flux_r', pa.float32(), True),
-              pa.field('lsst_flux_i', pa.float32(), True),
-              pa.field('lsst_flux_z', pa.float32(), True),
-              pa.field('lsst_flux_y', pa.float32(), True),
-              pa.field('mjd', pa.float64(), True)]
-    if include_roman_flux:
-        fields = _add_roman_fluxes(fields)
-    return pa.schema(fields)