diff --git a/CHANGELOG.md b/CHANGELOG.md index 5ae75732..c85d1734 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## 1.3.2 - July 17, 2024 + +### Improved + +* Add cartons to target_selection plan 1.2.3 + ## 1.3.1 - July 12, 2024 ### ✨Improved diff --git a/pyproject.toml b/pyproject.toml index f7fd9bb9..a127e2c5 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "sdss-target-selection" -version = "1.3.2.a0" +version = "1.3.2" description = "Code to perform target selection for BHM/MWM using catalogdb" authors = ["José Sánchez-Gallego "] license = "BSD 3-Clause" diff --git a/python/target_selection/cartons/mwm_more_ob.py b/python/target_selection/cartons/mwm_more_ob.py index a26ec775..263d3696 100644 --- a/python/target_selection/cartons/mwm_more_ob.py +++ b/python/target_selection/cartons/mwm_more_ob.py @@ -105,30 +105,22 @@ def build_query(self, version_id, query_region=None): CatalogToGaia_DR3.best >> True, CatalogToTwoMassPSC.version_id == version_id, CatalogToTwoMassPSC.best >> True, - (Gaia_DR3.parallax < peewee.fn.power(10, ((10.0 - TwoMassPSC.k_m + 0.0) / 5.0))), - (Gaia_DR3.parallax > peewee.fn.power(10, ((10.0 - TwoMassPSC.k_m - 0.61) / 5.0))), Gaia_DR3.phot_g_mean_mag < 16, - ( - TwoMassPSC.j_m - - TwoMassPSC.k_m - - 0.25 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) - < 0.10 - ), - ( - TwoMassPSC.j_m - - TwoMassPSC.k_m - - 0.25 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) - > -0.30 - ), - ( - TwoMassPSC.j_m - TwoMassPSC.h_m - < 0.15 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) + 0.05 - ), - ( - TwoMassPSC.j_m - TwoMassPSC.h_m - > 0.15 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) - 0.15 - ), - (Gaia_DR3.phot_g_mean_mag > 2 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) + 3.0), + Gaia_DR3.parallax < peewee.fn.power(10, ((10.0 - TwoMassPSC.k_m + 0.00) / 5.0)), + Gaia_DR3.parallax > peewee.fn.power(10, ((10.0 - TwoMassPSC.k_m - 0.61) / 5.0)), + TwoMassPSC.j_m + - TwoMassPSC.k_m + - 0.25 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) + < 0.10, + TwoMassPSC.j_m + - TwoMassPSC.k_m + - 0.25 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) + > -0.30, + TwoMassPSC.j_m - TwoMassPSC.h_m + < 0.15 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) + 0.05, + TwoMassPSC.j_m - TwoMassPSC.h_m + > 0.15 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) - 0.15, + Gaia_DR3.phot_g_mean_mag > 2 * (Gaia_DR3.phot_g_mean_mag - TwoMassPSC.k_m) + 3.0, ) ) diff --git a/python/target_selection/config/target_selection.yml b/python/target_selection/config/target_selection.yml index 09ea47a9..691def63 100644 --- a/python/target_selection/config/target_selection.yml +++ b/python/target_selection/config/target_selection.yml @@ -1,3 +1,21 @@ +'1.2.3': + xmatch_plan: 1.0.0 + cartons: + - openfibertargets_mwm_more_ob_boss + open_fiber_path: /uufs/chpc.utah.edu/common/home/sdss50/sdsswork/target/open_fiber/postv1/draft2/ + schema: sandbox + magnitudes: + h: [catalog_to_twomass_psc, twomass_psc, twomass_psc.h_m] + j: [catalog_to_twomass_psc, twomass_psc, twomass_psc.j_m] + k: [catalog_to_twomass_psc, twomass_psc, twomass_psc.k_m] + bp: [catalog_to_gaia_dr3_source, gaia_dr3_source, gaia_dr3_source.phot_bp_mean_mag] + rp: [catalog_to_gaia_dr3_source, gaia_dr3_source, gaia_dr3_source.phot_rp_mean_mag] + gaia_g: [catalog_to_gaia_dr3_source, gaia_dr3_source, gaia_dr3_source.phot_g_mean_mag] + database_options: + work_mem: '100MB' + enable_bitmapscan: false + enable_seqscan: false + '1.2.2': xmatch_plan: 1.0.0 cartons: