Merge pull request #102 from rahil-makadia/dev

ADES astCat check is case insensitive

Author: rahil-makadia

README.md

@@ -82,7 +82,7 @@ Once the GRSS library has been installed, it can be imported into a Python scrip
    import grss
 ```
 
-The first time the library is imported, it will download some data files such as NAIF SPICE kernels and the data needed to debias optical astrometry. This should should take a few minutes. Once these files are available to the library, you are ready to use GRSS to its full potential!
+The first time the library is imported, it will download some data files such as NAIF SPICE kernels and the data needed to debias optical astrometry. This should take a few minutes. Once these files are available to the library, you are ready to use GRSS to its full potential!
 
 Check out the [examples](https://rahil-makadia.github.io/grss/examples.html) on the [GRSS website](https://rahil-makadia.github.io/grss/) to get started.
 

environment.yml

@@ -3,7 +3,7 @@ channels:
   - conda-forge
   - defaults
 dependencies:
-  - python>=3.8,<3.13
+  - python>=3.10,<=3.13
   - pip
   - jupyter
   - ipykernel

grss/fit/fit_ades.py

@@ -101,7 +101,7 @@
     '6': 'Gaia_2016', 
 }
 # flip the dictionary to get the catalog codes
-ades_catalog_map = {v: k for k, v in ades_catalog_map.items()}
+ades_catalog_map = {v.lower(): k for k, v in ades_catalog_map.items()}
 
 # from ADES-Master/Python/bin/packUtil.py
 pack_letters = '0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz'

grss/fit/fit_optical.py

@@ -90,24 +90,15 @@ def _ades_ast_cat_check(df):
     """
     # from https://www.minorplanetcenter.net/iau/info/ADESFieldValues.html
     valid_cats = list(ades_catalog_map.keys())
-    deprecated_cats = [
-        'UCAC3', 'UCAC2', 'UCAC1',
-        'USNOB1', 'USNOA2', 'USNOSA2', 'USNOA1', 'USNOSA1',
-        'Tyc2', 'Tyc1', 'Hip2', 'Hip1', 'ACT',
-        'GSCACT', 'GSC2.3', 'GSC2.2', 'GSC1.2', 'GSC1.1', 'GSC1.0', 'GSC',
-        'SDSS8', 'SDSS7', 'CMC15', 'CMC14', 'SSTRC4', 'SSTRC1',
-        'MPOSC3', 'PPM', 'AC', 'SAO1984', 'SAO', 'AGK3', 'FK4',
-        'ACRS', 'LickGas', 'Ida93', 'Perth70', 'COSMOS',
-        'Yale', 'ZZCAT', 'IHW', 'GZ', 'UNK']
-    df_cats = df['astCat']
+    df_cats = df['astCat'].str.lower()
     if not df_cats.isin(valid_cats).all():
         invalid_cats = np.setdiff1d(df_cats.unique(), valid_cats)
         print("\tWARNING: At least one unrecognized astCat in the data. "
                 f"Unrecognized values are {invalid_cats}. "
-                "Force deleting corresponding observations and setting catalog to UNK...")
-        delete_idx = df[df['astCat'].isin(invalid_cats)].index
+                "Force deleting corresponding observations. "
+                "This can still lead to errors in processing the data...")
+        delete_idx = df[df_cats.isin(invalid_cats)].index
         df.loc[delete_idx, 'selAst'] = 'd'
-        df.loc[delete_idx, 'astCat'] = 'UNK'
     return df
 
 def create_optical_obs_df(body_id, optical_obs_file=None, t_min_tdb=None,
@@ -508,7 +499,7 @@ def apply_debiasing_scheme(obs_df, lowres, verbose):
         print("Applying Eggl et al. (2020) debiasing scheme to the observations.")
     df_groups = obs_df.groupby('astCat')
     for cat, group in df_groups:
-        cat_code = ades_catalog_map[cat]
+        cat_code = ades_catalog_map[cat.lower()]
         if cat_code in unbiased_catalogs:
             obs_df.loc[group.index, 'biasRA'] = 0.0
             obs_df.loc[group.index, 'biasDec'] = 0.0
@@ -604,7 +595,7 @@ def apply_station_weight_rules(group, obs_df, cols, verbose):
     default_weight_counter = 0
     all_times = obs_df.loc[group.index, 'obsTimeMJD'].values
     all_stns = obs_df.loc[group.index, 'stn'].values
-    all_cats = obs_df.loc[group.index, 'astCat'].values
+    all_cats = obs_df.loc[group.index, 'astCat'].str.lower().values
     all_progs = obs_df.loc[group.index, 'prog'].values
     ccd_weight_arr = np.ones((len(group), 2))*np.nan
     for i in range(len(group)):

grss/version.txt

@@ -1 +1 @@
-4.5.3
+4.5.4

pyproject.toml

@@ -31,11 +31,10 @@ classifiers = [
     "Programming Language :: C++",
     "Programming Language :: Python :: 3",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.8",
-    "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "Topic :: Scientific/Engineering :: Astronomy",
 ]
 

setup.py

@@ -46,7 +46,7 @@ def build_extension(self, ext: CMakeExtension) -> None:
 # if os is windows, throw error and exit
 if os.name == "nt":
     raise OSError("Windows is not supported.",
-                    "Please use the Windows Subsystem for if you do not have access to another OS.")
+                    "Please use the Windows Subsystem for Linux if you do not have access to another OS.")
 
 setup(
     ext_modules=[CMakeExtension("libgrss")],