From af88f566917c4c945912bc95ce42a4239a4656ea Mon Sep 17 00:00:00 2001 From: Pramod Gupta <61213683+astronomygupta@users.noreply.github.com> Date: Thu, 1 Aug 2024 07:06:37 -0700 Subject: [PATCH] Tag1.3.11 (#484) * edits for tag1.3.11 * edits for tag1.3.11 * edits for tag1.3.11 --- CHANGELOG.md | 6 +++++ pyproject.toml | 2 +- python/target_selection/cartons/base.py | 4 ---- .../config/target_selection.yml | 22 +++++++++++++++++++ 4 files changed, 29 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index bb842d4d..feaf57b8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ ## Next version +## 1.3.11 - August 1, 2024 + +### 🚀 New + +* add cartons to target_selection plan 1.2.12 + ## 1.3.10 - July 30, 2024 ### 🚀 New diff --git a/pyproject.toml b/pyproject.toml index ab13e455..9770be25 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "sdss-target-selection" -version = "1.3.11.a0" +version = "1.3.11" 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/base.py b/python/target_selection/cartons/base.py index 0bec9cbb..1f3181a6 100644 --- a/python/target_selection/cartons/base.py +++ b/python/target_selection/cartons/base.py @@ -209,10 +209,6 @@ def get_model(self): class Model(BaseModel): catalogid = peewee.BigIntegerField(primary_key=True) selected = peewee.BooleanField() - cadence = peewee.TextField() - instrument = peewee.TextField() - priority = peewee.IntegerField() - selected = peewee.BooleanField() class Meta: database = self.database diff --git a/python/target_selection/config/target_selection.yml b/python/target_selection/config/target_selection.yml index 08830599..2cff27a0 100644 --- a/python/target_selection/config/target_selection.yml +++ b/python/target_selection/config/target_selection.yml @@ -1,3 +1,24 @@ +'1.2.12': + xmatch_plan: 1.0.0 + cartons: + - mwm_bin_rv_short_rgb_apogee_08epoch + - mwm_bin_rv_short_rgb_apogee_12epoch + - mwm_bin_rv_short_subgiant_apogee_08epoch + - mwm_bin_rv_short_subgiant_apogee_12epoch + 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: '200MB' + enable_bitmapscan: false + enable_seqscan: false + '1.2.11': xmatch_plan: 1.0.0 cartons: @@ -56,6 +77,7 @@ work_mem: '200MB' enable_bitmapscan: false enable_seqscan: false + '1.2.8': xmatch_plan: 1.0.0 cartons: