From 8a3ac9c7d0ea20d60ef68a0424af89d24560c4e6 Mon Sep 17 00:00:00 2001
From: Pramod Gupta <psgupta@astro.washington.edu>
Date: Mon, 23 Dec 2024 05:46:36 -0700
Subject: [PATCH] mwm_openfiber.py: edit
 openfibertargets_mwm_mdwarfs_plato_apogee

---
 CHANGELOG.md                                     |  7 +++++++
 pyproject.toml                                   |  2 +-
 python/target_selection/cartons/mwm_openfiber.py |  8 +++++++-
 .../target_selection/config/target_selection.yml | 16 ++++++++++++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2320d014..426b68aa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Changelog
 
+## 1.3.20 - December 20, 2024
+
+### New
+
+* added target_selection plan 1.2.18
+* added carton openfibertargets_mwm_mdwarfs_plato_apogee
+
 ## 1.3.19 - December 14, 2024
 
 ### ✨ Improved
diff --git a/pyproject.toml b/pyproject.toml
index 5b0c8a3c..4c972291 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "sdss-target-selection"
-version = "1.3.20a0"
+version = "1.3.20"
 description = "Code to perform target selection for BHM/MWM using catalogdb"
 authors = ["José Sánchez-Gallego <gallegoj@uw.edu>"]
 license = "BSD 3-Clause"
diff --git a/python/target_selection/cartons/mwm_openfiber.py b/python/target_selection/cartons/mwm_openfiber.py
index 5735735e..d2142dcb 100644
--- a/python/target_selection/cartons/mwm_openfiber.py
+++ b/python/target_selection/cartons/mwm_openfiber.py
@@ -66,6 +66,9 @@ class Openfibertargets_mwm_mdwarfs_plato_apogee_Carton(BaseCarton):
     priority = 6085
     can_offset = False
 
+    # In the below query,
+    # Gaia_DR3.l is for galactic longitude
+    # Gaia_DR3.b is for galactic latitude
     def build_query(self, version_id, query_region=None):
         query = (
             CatalogToGaia_DR3.select(
@@ -75,10 +78,13 @@ def build_query(self, version_id, query_region=None):
                 Gaia_DR3.dec.alias("gaia_dr3_dec"),
                 Gaia_DR3.pmra.alias("gaia_dr3_pmra"),
                 Gaia_DR3.pmdec.alias("gaia_dr3_pmdec"),
-                Gaia_DR3.bp_rp.alias("bp_rp_0"),
                 Gaia_DR3.phot_g_mean_mag.alias("gaia_g"),
                 Gaia_DR3.phot_bp_mean_mag.alias("bp"),
                 Gaia_DR3.phot_rp_mean_mag.alias("rp"),
+                Gaia_DR3.bp_rp,
+                Gaia_DR3.parallax,
+                Gaia_DR3.l,
+                Gaia_DR3.b
             )
             .join(Gaia_DR3, on=(CatalogToGaia_DR3.target_id == Gaia_DR3.source_id))
             .where(
diff --git a/python/target_selection/config/target_selection.yml b/python/target_selection/config/target_selection.yml
index 5ff2b941..541aa211 100644
--- a/python/target_selection/config/target_selection.yml
+++ b/python/target_selection/config/target_selection.yml
@@ -1,3 +1,19 @@
+'1.2.18':
+  xmatch_plan: 1.0.0
+  cartons:
+    - openfibertargets_mwm_mdwarfs_plato_apogee
+  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: '2000MB'
+
 '1.2.17':
   xmatch_plan: 1.0.0
   cartons: