diff --git a/astro_data/corrections/collinder.toml b/astro_data/corrections/collinder.toml index 31ae4d44b..472901d23 100644 --- a/astro_data/corrections/collinder.toml +++ b/astro_data/corrections/collinder.toml @@ -50,11 +50,6 @@ why = "collinder2.txt gives NGC 457 the one name 'Owl or E.T. Cluster', which is sources = ["https://en.wikipedia.org/wiki/NGC_457"] names.remove = ["Owl or E.T. Cluster"] -["IC 2602"] -why = "collinder2.txt's 'Theta Carinae Cluster, Southern Pleiades' is two names in one string; the sky object already carries 'Southern Pleiades'." -sources = ["https://en.wikipedia.org/wiki/IC_2602"] -names.remove = ["Theta Carinae Cluster, Southern Pleiades"] - ["Col 208"] why = "collinder.txt names Collinder 208 'IC 2488' and gives IC 2488's magnitude (7.4) and size (18'), but a Dec of -57 40, 43' south of IC 2488 (SIMBAD 09 27 25.7 -57 00 14), so the match guard rejects the join: a Dec slip in Collinder." sources = ["https://simbad.cds.unistra.fr/simbad/sim-id?Ident=IC%202488"] diff --git a/astro_data/corrections/sac_multistars.toml b/astro_data/corrections/sac_multistars.toml index 716bb62ed..d9116f397 100644 --- a/astro_data/corrections/sac_multistars.toml +++ b/astro_data/corrections/sac_multistars.toml @@ -327,16 +327,6 @@ why = "SAC names xi Peg 'Menkib', which is xi Per's name (IAU WGSN). xi Peg's ow sources = ["https://www.pas.rochester.edu/~emamajek/WGSN/IAU-CSN.txt"] names.remove = ["Menkib"] -["SaM 1633"] -why = "SAC lists Fomalhaut as a double, so the D* rule types it D*. Its 14 mag companion at 30\" is See's lambda 478, which Burnham showed is a field star, and WDS has dropped it (Mamajek et al. 2013)." -sources = [ - "WDS, wds_precise.txt as shipped in PiFinder astro_data/WDS (GSU/USNO, 2025-09): 22577-2937 KAL 1, SHY 106, MAM 1 only", - "https://arxiv.org/pdf/1310.0764 (Mamajek et al. 2013, Fomalhaut C, section on See 1898)", - "https://en.wikipedia.org/wiki/Fomalhaut", -] -obj_type = "*" -was.obj_type = "D*" - ["SaM 1745"] why = "SAC lists zeta Scl as a double, so the D* rule types it D*. Its only pair, B 631, is flagged X (dubious) in WDS." sources = [ @@ -346,16 +336,6 @@ sources = [ obj_type = "*" was.obj_type = "D*" -["SaM 1241"] -why = "SAC lists Vega AB, so the D* rule types Vega D*. Its WDS companions are all field stars: H 5 39 AB 9.5 at 85\" (U, non-physical), STFB 9 AC 11.0 at 79\" and AE 9.5 at 83\" (S), and faint MET 11 stars, so to an observer it is a single star (the audit: * equally acceptable; planned in #683)." -sources = [ - "WDS, wds_precise.txt as shipped in PiFinder astro_data/WDS (GSU/USNO, 2025-09)", - "Hipparcos I/239 hip_main.dat (PiFinder astro_data), CCDM fields H55-H62", - "Bright Star Catalogue V/50 via VizieR", -] -obj_type = "*" -was.obj_type = "D*" - ["SaM 693"] why = "SAC's STF 2576 row (8.0/8.0 at 19 46.0 +33 36) lies about 5' from its star, outside the cross-match's 3' radius, and no WDS row names it. STF 2576 AB is HD 186858 = HIP 97222 (V 7.66, K5V+K5V), WDS 19464+3344 FG at 19 45 33.5 +33 36 07." sources = [ diff --git a/astro_data/corrections/steinicke.toml b/astro_data/corrections/steinicke.toml index 3de02eed2..0ab679263 100644 --- a/astro_data/corrections/steinicke.toml +++ b/astro_data/corrections/steinicke.toml @@ -1374,6 +1374,15 @@ sources = [ ] same_as = "NGC 6679" +["NGC 771"] +why = "Steinicke lists NGC 771 as a star, apart from the star it is. Corwin: NGC 771 = 50 Cassiopeiae is a star, a normal A1 V star with no nebulosity on the POSS1 (JH suspected it once). 50 Cas is HIP 9598, IAU name Gang, the Named Stars listing Nam 9598." +sources = [ + "http://haroldcorwin.net/ngcic/ngconly.txt", + "http://haroldcorwin.net/ngcic/ngcnotes.all", + "https://simbad.cds.unistra.fr/simbad/sim-id?Ident=NGC%20771", +] +same_as = "Nam 9598" + ["NGC 6885"] why = "NGC 6885 = NGC 6882 (Corwin, OpenNGC, Steinicke): one open cluster around 20 Vul. Steinicke's shared position is 5' north-west of Corwin's and OpenNGC's centre, 20 12 00 +26 30.2." sources = [ diff --git a/astro_data/pifinder_objects.db b/astro_data/pifinder_objects.db index 742a154c7..089ba7042 100644 Binary files a/astro_data/pifinder_objects.db and b/astro_data/pifinder_objects.db differ diff --git a/docs/ax/catalog.md b/docs/ax/catalog.md index 9c123f11e..3a6d38974 100644 --- a/docs/ax/catalog.md +++ b/docs/ax/catalog.md @@ -436,16 +436,13 @@ without committing the data (9.7), copy the result out and restore the tracked file with `git checkout -- astro_data/pifinder_objects.db` before the next build. -> **Status (2026-11-08).** Parts of this section describe the import as -> the catalog-audit fixes leave it, not as `main` has it today. The -> supplementary sources (9.4) — Hipparcos, WGSN, Bica and RC3 — are in -> `catalog_imports/supplementary_sources.py`. -> The designation allowlist, the match guard (9.3) and precedence (9.1) -> are in `catalog_imports/catalog_import_utils.py`, the star cross-match -> (9.3) in `catalog_imports/star_identity.py`. The correction pass -> (9.5) is in `catalog_imports/corrections.py`, and -> `astro_data/corrections/` holds no corrections yet. -> The decision record is [ADR 0046](../adr/0046-catalog-corrections-cited-checked-applied-last.md). +The committed database is a build of the import this section describes. +The designation allowlist, the match guard (9.3) and precedence (9.1) +are in `catalog_imports/catalog_import_utils.py`, the star cross-match +(9.3) in `catalog_imports/star_identity.py`, the supplementary sources +(9.4) in `catalog_imports/supplementary_sources.py`, and the correction +pass (9.5) in `catalog_imports/corrections.py`. The decision record is +[ADR 0046](../adr/0046-catalog-corrections-cited-checked-applied-last.md). ### 9.1 Pipeline @@ -586,6 +583,24 @@ Arp 79's NGC 5490C, a galaxy of its own 4.8′ from NGC 5490, does not. A source can mean either by the letter, so every other loader keeps the strict default, where "NGC 4676A" is a plain name. +**A loader writes its source's designations out before they are akas.** +The allowlist reads "NGC 581", not the "581 (M103)" of `collinder.txt`, +which would stay a plain name and leave Col 14 a second sky object beside +M 103. So the Collinder loader reads its two name columns +(`collinder_names`): + +- `collinder.txt`'s "NGC/Other Cat." holds a designation, often with a + second one in parentheses: "581 (M103)" is "NGC 581" and "M 103", + "IC4725 (M25)" is "IC 4725" and "M 25", "Tr.9" is "Trumpler 9". A part of + an NGC object ("2384a") is the name "NGC 2384a", which joins nothing. +- A cross-reference that the source marks wrong ("(incorrectly) 3247") + gives no aka, so it can never join. Nor does a placeholder ("nl"), the + Flamsteed numbers of a cluster's stars ("4-5 Vul."), or text in + parentheses that is not one designation ("(Mel 72 per A/H)"). +- `collinder2.txt`'s "Other names" is a comma-separated list, and each + item is a name: Col 399 is "Al Sufi's Cluster", "Brocchi's Cluster" and + "Coathanger". + **Stars are identified by Hipparcos number.** The star-identity stage cross-matches every sky object that carries a listing of a star catalog (Str, SaM, SaR, TLK, RDS, WDS) to `hip_main.dat`, and merges the sky @@ -724,20 +739,20 @@ RASC's doubles (RDS), or a WDS pair that is a double star lists it; otherwise `*`. Each loader types its own listings by the rule — SaM and RDS `D*`; Str, SaR and TLK `*`; a WDS listing `D*` when one of its pairs is a double star — and a merged star is `D*` if any of its sky objects -was. A WDS pair is a double star if WDS flags it neither optical -(S, U, Y, L) nor dubious (X), it includes the primary (its components -are blank or start with A), and its companion is one an observer would -look for: between 0.5″ and 60″ from the primary and within 5 mag of it -(Rich's choice, 2026-10; the limits are named constants in -`wds_loader.py`). Closer pairs are interferometric, split by no observer -(Capella, Algol, Dschubba). WDS lists every pair -ever measured, and many it has never flagged are faint field stars: -without those limits nearly every bright star would be a double -(Alphard's 9.7 mag companion at 284″, Vega's 12 mag survey stars). -Hipparcos's CCDM letter is blank for wide pairs and for pairs it could -not resolve (Sirius, Polaris, Antares), so neither decides by itself. -SAC lists Vega and Fomalhaut, so the rule makes them `D*`; their -companions are field stars, and corrections make them `*`. +was. A WDS pair is a double star unless WDS notes it as dubious (X) or +gives no magnitude for its companion: optical pairs (S, U, Y, L) count, +and so do pairs without the primary (BC), and pairs however close, wide +or unequal. WDS lists a pair because someone measured it as one, so the +type says what the object is; whether an observer can see the companion +is for the filters (a double filters by its brighter star, 2.2) and for +the separation and both magnitudes the entry shows. This follows +mrosseel's review of #697 (2026-11). The earlier rule kept only +unflagged pairs with the primary, 0.5″ to 60″ apart and within 5 mag, +and typed 40,788 of WDS's 131,303 listings `*`; the rule now types +10,597 `*`, nearly all because their only pairs are flagged X. Vega +(optical companions) and Fomalhaut (SHY 106, its wide companion TW PsA) +are `D*` by WDS, as SAC lists them. ζ Scl, which SAC lists but whose only +WDS pair (B 631) is flagged X, has a correction that makes it `*`. A **not-found** NGC/IC number (Steinicke's status 10, about 300 of them) keeps its listing, its nominal position and type `?`, and its @@ -939,7 +954,7 @@ of strings is ordered by Python's per-process hash seed and is not. ### 9.7 Committing the database -The committed `pifinder_objects.db` is about 23 MB compressed, and a +The committed `pifinder_objects.db` is about 24 MB compressed, and a fielded unit's update downloads every version of it that was committed since its last one. Commit a rebuilt database only in a pull request that means to change the data, and batch import changes so one rebuild diff --git a/docs/ax/catalog/CONTEXT.md b/docs/ax/catalog/CONTEXT.md index e10a0e163..76e9ffff6 100644 --- a/docs/ax/catalog/CONTEXT.md +++ b/docs/ax/catalog/CONTEXT.md @@ -166,7 +166,7 @@ An NGC or IC number with nothing at Dreyer's position (Steinicke's status 10). I _Avoid_: nonexistent object (OpenNGC's `NonEx`; some are later identified), missing object, phantom. **Double star** (`D*`): -A star with a companion worth looking for: one an observer's double-star list (SAC, RASC) lists, or a WDS pair that is neither optical nor dubious, includes the star as its primary, and has its companion between 0.5″ and 60″ from it and within 5 mag of it (Rich's choice: WDS's unflagged pairs include many faint field stars, and interferometric pairs no observer can split). What the device's "double star" type filter finds. A star that WDS lists only with optical companions (Vega) is a single star (`*`). +A star that a double-star list names as a pair: an observer's double-star list (SAC, RASC) lists it, or WDS lists it in a pair that WDS does not note as dubious (X) and that has a companion magnitude. Optical pairs count, as do pairs without the star as primary and pairs however close, wide or unequal: the type says what the object is, and whether the companion is visible is for the filters and for the separation and magnitudes the entry shows (mrosseel's review of #697). What the device's "double star" type filter finds. A star that WDS lists only in dubious pairs (ζ Scl) is a single star (`*`). _Avoid_: binary (that's physical, and some listed pairs aren't proven binaries), multiple star. **Common name**: diff --git a/python/PiFinder/catalog_imports/specialized_loaders.py b/python/PiFinder/catalog_imports/specialized_loaders.py index 6535885e5..322034786 100644 --- a/python/PiFinder/catalog_imports/specialized_loaders.py +++ b/python/PiFinder/catalog_imports/specialized_loaders.py @@ -9,8 +9,10 @@ import csv import json import logging +import re import sqlite3 from pathlib import Path +from typing import List, Optional from tqdm import tqdm from collections import namedtuple, defaultdict @@ -97,6 +99,110 @@ def load_egc(): conn.commit() +# collinder.txt abbreviates the catalogs that it cites, and collinder2.txt +# writes them in full. Keyed on the lowercase prefix; a bare number is NGC. +_COLLINDER_CATALOGS = { + "": "NGC", + "ic": "IC", + "m": "M", + "tr": "Trumpler", + "trumpler": "Trumpler", + "mel": "Melotte", + "melotte": "Melotte", + "harv": "Harvard", + "harvard": "Harvard", +} + +# A designation in collinder.txt's "NGC/Other Cat." column: "581", "IC1848", +# "M45", "Tr.9", "Mel 15", "Harvard 8", and a part of an NGC object, "2384a". +_COLLINDER_DESIGNATION_RE = re.compile(r"([A-Za-z]*)\.?\s*(\d+)([a-z]?)") + +# "581 (M103)", "(Harvard 8)": a value, then a second one in parentheses. +_COLLINDER_PARENTHESES_RE = re.compile(r"([^()]*)\(([^()]*)\)") + +# "4-5 Vul.", "9-12 Gem": the Flamsteed numbers of a cluster's bright stars. +_COLLINDER_STAR_GROUP_RE = re.compile(r"\d+-\d+ [A-Z][a-z]{2}\.?") + +# "nl": not listed. +_COLLINDER_PLACEHOLDERS = frozenset({"", "nl", "-"}) + +# The mark on a cross-reference of Collinder's that is wrong. +_COLLINDER_WRONG = "(incorrectly)" + + +def collinder_designation(text: str) -> Optional[str]: + """A designation of collinder.txt written out, or None if text is not one. + + "581" -> "NGC 581", "IC1848" -> "IC 1848", "Tr.9" -> "Trumpler 9", + "2384a" -> "NGC 2384a". A catalog that the file does not abbreviate + ("Markarian 18") is not read here: it stays a name as written. + """ + match = _COLLINDER_DESIGNATION_RE.fullmatch(text.strip()) + if match is None: + return None + prefix, number, part = match.groups() + catalog = _COLLINDER_CATALOGS.get(prefix.lower()) + if catalog is None: + return None + return f"{catalog} {int(number)}{part}" + + +def collinder_other_catalogs(raw: str) -> List[str]: + """The names that collinder.txt's "NGC/Other Cat." column gives a cluster. + + The column holds a designation ("581", "IC1848", "Tr.9"), often with a + second one in parentheses ("581 (M103)"), or a name ("Orion Cluster"). + Each designation is written out, so one of a PiFinder catalog joins its + sky object. These are not names, and give nothing: + + - a placeholder ("nl"); + - a cross-reference marked wrong ("(incorrectly) 3247"): the cluster is + not NGC 3247, so it must not join it; + - the Flamsteed numbers of a cluster's stars ("4-5 Vul."); + - text in parentheses that is not one designation ("(PMC)", + "(Mel 72 per A/H)"): a note. + """ + text = " ".join(raw.split()) + if text.lower() in _COLLINDER_PLACEHOLDERS or text.startswith(_COLLINDER_WRONG): + return [] + value, note = text, "" + match = _COLLINDER_PARENTHESES_RE.fullmatch(text) + if match is not None: + value, note = (part.strip() for part in match.groups()) + names = [] + if value and not _COLLINDER_STAR_GROUP_RE.fullmatch(value): + designation = collinder_designation(value) + if designation is None: + # A name. A final "Cl." can only be "Cluster" ("Antares Cl."). + designation = re.sub(r"\bCl\.$", "Cluster", value) + names.append(designation) + noted = collinder_designation(note) if note else None + if noted is not None: + names.append(noted) + return names + + +def collinder_other_names(raw: str) -> List[str]: + """The names that collinder2.txt's "Other names" column gives a cluster. + + The column is a comma-separated list ("Beehive Cluster, Praesepe"). A + footnote mark ("[note 1]") is not a name. + """ + names = (name.strip() for name in raw.split(",")) + return [name for name in names if name and not name.startswith("[note")] + + +def collinder_names(other_catalogs: str, other_names: str) -> List[str]: + """A Collinder listing's names from both files, in order, each one once.""" + names: List[str] = [] + for name in collinder_other_catalogs(other_catalogs) + collinder_other_names( + other_names + ): + if name not in names: + names.append(name) + return names + + def load_collinder(): logging.info("Loading Collinder") catalog = "Col" @@ -122,8 +228,6 @@ def load_collinder(): dfs = line.split("\t") sequence = dfs[0].split(" ")[0] other_names = dfs[1] - if other_names.isnumeric(): - other_names = "NGC " + other_names ra = dfs[3] ra_h = int(ra[0:2]) @@ -142,7 +246,7 @@ def load_collinder(): collinder = Collinder( sequence=sequence, - other_names=other_names.strip(), + other_names=other_names, ra_deg=ra_deg, dec_deg=dec_deg, size=size, @@ -169,18 +273,8 @@ def load_collinder(): mag = MagnitudeObject([]) else: mag = MagnitudeObject([float(mag)]) - other_names = dfs[2].strip() c_tuple = c_dict[sequence] - - # Collect all valid names more efficiently - aka_names = [] - if c_tuple.other_names and not c_tuple.other_names.startswith( - ("[note", "Tr.", "Harv.", "Mel.") - ): - aka_names.append(c_tuple.other_names) - - if other_names and not other_names.startswith("[note"): - aka_names.append(other_names) + aka_names = collinder_names(c_tuple.other_names, dfs[2]) new_object = NewCatalogObject( object_type=obj_type, diff --git a/python/PiFinder/catalog_imports/wds_loader.py b/python/PiFinder/catalog_imports/wds_loader.py index 60a0a98d0..5adeaf59b 100644 --- a/python/PiFinder/catalog_imports/wds_loader.py +++ b/python/PiFinder/catalog_imports/wds_loader.py @@ -126,38 +126,25 @@ def wds_magnitudes(mag1: float, mag2: float) -> MagnitudeObject: return MagnitudeObject(mags) -# The D* rule's WDS clause (docs/ax/catalog.md §9.3): WDS lists every pair -# ever measured, so a pair makes a double star only if WDS flags it neither -# optical (S, U, Y, L) nor dubious (X), it includes the primary, and its -# companion is one an observer would look for: within this separation and -# magnitude difference of the primary, and wide enough to split (Capella's -# and Algol's interferometric pairs are not). Vega's companions fail, -# Propus's BU 1008 (6.2 at 1.9") passes. The limits are Rich's choice -# (2026-10), his to tune. -OPTICAL_OR_DUBIOUS = frozenset("SUYLX") -DOUBLE_MIN_SEPARATION_ARCSEC = 0.5 -DOUBLE_MAX_SEPARATION_ARCSEC = 60.0 -DOUBLE_MAX_DELTA_MAG = 5.0 +# The D* rule's WDS clause (docs/ax/catalog.md §9.3): a WDS listing is a +# double star if any of its pairs is one. WDS lists a pair because someone +# measured it as a pair, so every pair is a double, optical (S, U, Y, L) or +# not, with the primary or without (BC), however close, wide or unequal. +# The type says what the object is; whether an observer can see the +# companion is for the filters (a double filters by its brighter star) and +# for the separation and both magnitudes on the entry. Only a pair WDS +# notes as dubious (X), and a pair without a companion's magnitude, are not +# doubles. This follows mrosseel's review of #697 (2026-11); before it, the +# rule kept only unflagged pairs with the primary, 0.5-60" apart and within +# 5 mag, and typed 40,788 of WDS's 131,303 listings single. +DUBIOUS = "X" def is_double_star_pair(value) -> bool: - """Whether one WDS pair makes its primary a double star (D*).""" - if set(value["Notes"]) & OPTICAL_OR_DUBIOUS: + """Whether one WDS pair makes its listing a double star (D*).""" + if DUBIOUS in value["Notes"]: return False - components = value["Components"].strip() - if components and not components.startswith("A"): - return False - sep = value["Sep"].item() - if np.isnan(sep) or not ( - DOUBLE_MIN_SEPARATION_ARCSEC <= sep <= DOUBLE_MAX_SEPARATION_ARCSEC - ): - return False - mag1, mag2 = value["Mag_First"].item(), value["Mag_Second"].item() - if np.isnan(mag2): - return False - # WDS gives magnitudes to 0.01, so compare the difference at that - # precision: 18.6 - 13.6 is 5.000000000000002 in floating point. - return bool(np.isnan(mag1) or round(mag2 - mag1, 2) <= DOUBLE_MAX_DELTA_MAG) + return not np.isnan(value["Mag_Second"].item()) def wds_dm_number(raw: str) -> Optional[Tuple[str, int, int]]: diff --git a/python/tests/test_catalog_data.py b/python/tests/test_catalog_data.py index 7478cef13..a13070f1b 100644 --- a/python/tests/test_catalog_data.py +++ b/python/tests/test_catalog_data.py @@ -1,3 +1,4 @@ +import json import pytest import threading from PiFinder.db import objects_db @@ -22,10 +23,10 @@ def test_object_counts(): "Ta2": 200, "H": 400, "SaA": 114, - "SaM": 2162, + "SaM": 2157, # 5 rows SAC marks as rejected pairs ("rej.") are skipped "SaR": 333, "Str": 78, - "EGC": 91, + "EGC": 102, "RDS": 110, "B": 343, "Sh2": 313, @@ -34,11 +35,12 @@ def test_object_counts(): "TLK": 93, "Har": 147, "Lyn": 1151, + "Nam": 578, } # catalog count num_catalogs = len(list(db.get_catalogs())) - assert num_catalogs == 21 + assert num_catalogs == 22 actual_catalogs = [row["catalog_code"] for row in db.get_catalogs()] expected_catalogs = list(catalog_counts.keys()) missing_catalogs = set(expected_catalogs) - set(actual_catalogs) @@ -291,8 +293,8 @@ def check_ic_objects(): "name": "Heart Nebula", "ra": 38.200, # RA = 02h 32m 48s "dec": 61.450, # Dec = +61° 27' 00" - # "obj_type": "Nb", # Emission nebula - "obj_type": "OC", # Open cluster at the heart of the nebula + # Cluster with nebula: Trumpler class "n" (#676) + "obj_type": "C+N", "const": "Cas", # Cassiopeia }, { @@ -353,6 +355,248 @@ def test_catalog_data_validation(): check_ic_objects() +# The catalog-audit fixes (#670) as the committed database holds them. + + +def listing_object(db, catalog_code, sequence): + """The sky object a catalog listing belongs to.""" + listing = db.get_catalog_object_by_sequence(catalog_code, sequence) + assert listing is not None, f"{catalog_code} {sequence} should exist" + return db.get_object_by_id(listing["object_id"]) + + +def object_listings(db, object_id): + """The sky object's listings, as designators.""" + return { + f"{row['catalog_code']} {row['sequence']}" + for row in db.get_catalog_objects_by_object_id(object_id) + } + + +def object_names(db, object_id): + """The sky object's names in import order, repeats dropped, as the device loads them.""" + db.cursor.execute( + "SELECT common_name FROM names WHERE object_id = ? ORDER BY rowid;", + (object_id,), + ) + return list(dict.fromkeys(row["common_name"] for row in db.cursor.fetchall())) + + +def objects_named(db, name): + db.cursor.execute( + "SELECT DISTINCT object_id FROM names WHERE common_name = ?;", (name,) + ) + return [row["object_id"] for row in db.cursor.fetchall()] + + +@pytest.fixture(scope="module") +def hipparcos(): + from PiFinder.catalog_imports.star_identity import load_hipparcos + + return load_hipparcos() + + +def hip_position(hipparcos, hip): + i = hipparcos.index_of(hip) + return hipparcos.ra[i], hipparcos.dec[i] + + +@pytest.mark.unit +def test_messier_preferred_names(): + db = objects_db.ObjectsDatabase() + m82 = object_names(db, listing_object(db, "M", 82)["id"]) + assert m82[0] == "Cigar Galaxy" + assert not any(name.lower() == "bode's nebulae" for name in m82) + m57 = object_names(db, listing_object(db, "M", 57)["id"]) + assert m57[0] == "Ring Nebula" + + +@pytest.mark.unit +def test_not_found_description(): + db = objects_db.ObjectsDatabase() + listing = db.get_catalog_object_by_sequence("NGC", 56) + assert listing["description"].startswith( + "Not found: nothing at Dreyer's position (Steinicke).\n" + ) + assert db.get_object_by_id(listing["object_id"])["obj_type"] == "?" + + +@pytest.mark.unit +def test_mizar_is_one_double_star(): + db = objects_db.ObjectsDatabase() + assert len(objects_named(db, "Mizar")) == 1 + mizar = listing_object(db, "Nam", 65378) + assert mizar["obj_type"] == "D*" + assert object_listings(db, mizar["id"]) == { + "Str 56", + "SaM 2054", + "WDS 70779", + "Nam 65378", + } + assert object_names(db, mizar["id"])[0] == "Mizar" + # A double star is filtered by its brightest magnitude. + mag = json.loads(mizar["mag"]) + assert mag["mags"] == [2.23, 4.0] + assert mag["filter_mag"] == 2.23 + + +@pytest.mark.unit +def test_vega_takes_hipparcos_values(hipparcos): + db = objects_db.ObjectsDatabase() + vega = listing_object(db, "Nam", 91262) + assert object_listings(db, vega["id"]) >= {"Str 77", "SaM 1241", "WDS 94640"} + # Its WDS pairs are optical, and every WDS pair is a double star. + assert vega["obj_type"] == "D*" + assert json.loads(vega["mag"])["filter_mag"] == 0.03 + ra, dec = hip_position(hipparcos, 91262) + assert vega["ra"] == pytest.approx(ra, abs=1e-9) + assert vega["dec"] == pytest.approx(dec, abs=1e-9) + + +@pytest.mark.unit +@pytest.mark.parametrize( + "listing, listings, obj_type", + [ + # Atria's only pair, WFC 179 (11.45 at 92"), is flagged optical (U). + ("Nam 82273", {"WDS 85313", "Nam 82273"}, "D*"), + # Suhail's only pair, SEE 109, is 12.6 mag fainter (2.21/14.8). + ("Nam 44816", {"WDS 50823", "Nam 44816"}, "D*"), + # Arcturus's only pair, HDS 2003, is flagged dubious (X). + ("Nam 69673", {"Str 28", "WDS 74543", "Nam 69673"}, "*"), + ], +) +def test_every_wds_pair_but_a_dubious_one_is_a_double_star(listing, listings, obj_type): + db = objects_db.ObjectsDatabase() + code, sequence = listing.split() + star = listing_object(db, code, int(sequence)) + assert object_listings(db, star["id"]) == listings + assert star["obj_type"] == obj_type + + +@pytest.mark.unit +def test_wds_listings_by_type(): + db = objects_db.ObjectsDatabase() + counts = dict( + db.conn.execute( + "SELECT o.obj_type, COUNT(*) FROM catalog_objects c" + " JOIN objects o ON o.id = c.object_id" + " WHERE c.catalog_code = 'WDS' GROUP BY o.obj_type" + ).fetchall() + ) + assert counts == {"D*": 120706, "*": 10597} + + +@pytest.mark.unit +def test_sam_1019_is_hip_44804(hipparcos): + # SAC's position for STF 1316 is 14' off; the WDS designation identifies it. + db = objects_db.ObjectsDatabase() + star = listing_object(db, "SaM", 1019) + assert object_listings(db, star["id"]) == {"SaM 1019", "WDS 50812"} + ra, dec = hip_position(hipparcos, 44804) + assert star["ra"] == pytest.approx(ra, abs=1e-9) + assert star["dec"] == pytest.approx(dec, abs=1e-9) + + +@pytest.mark.unit +@pytest.mark.parametrize( + "listing, joined", + [ + (("IC", 2145), "NGC 2086"), # Corwin: IC 2145 = NGC 2086 + (("NGC", 771), "Nam 9598"), # Corwin: NGC 771 = 50 Cas (Gang) + (("WDS", 99456), "Nam 94645"), # Gumala, by a hip correction + ], +) +def test_identifications_join_one_sky_object(listing, joined): + db = objects_db.ObjectsDatabase() + sky_object = listing_object(db, *listing) + assert object_listings(db, sky_object["id"]) == { + f"{listing[0]} {listing[1]}", + joined, + } + + +@pytest.mark.unit +def test_iau_names_keep_their_diacritics(): + db = objects_db.ObjectsDatabase() + star = listing_object(db, "Nam", 88567) + assert object_names(db, star["id"])[0] == "Dhanuśarāgra" + assert objects_named(db, "Gumala") == [listing_object(db, "Nam", 94645)["id"]] + + +@pytest.mark.unit +def test_collinder_399_has_three_separate_names(): + # collinder2.txt's comma list is three names. collinder.txt's "4-5 Vul.", + # the Flamsteed numbers of the Coathanger's stars, is not a name. + db = objects_db.ObjectsDatabase() + coathanger = listing_object(db, "Col", 399) + assert object_listings(db, coathanger["id"]) == {"Col 399", "Ta2 173", "Lyn 847"} + names = object_names(db, coathanger["id"]) + assert names[:4] == [ + "Col 399", + "Al Sufi's Cluster", + "Brocchi's Cluster", + "Coathanger", + ] + assert "4-5 Vul." not in names + assert not any("," in name for name in names) + + +@pytest.mark.unit +@pytest.mark.parametrize( + "sequence, listings", + [ + # collinder.txt: "581 (M103)", "2632 (M44)", "IC4725 (M25)", + # "Mel 15 (IC1805)", and "6374 (6383)" beside Col 335's "6383". + (14, {"NGC 581", "M 103", "Col 14", "Lyn 44"}), + (189, {"NGC 2632", "M 44", "Col 189", "Lyn 449"}), + (382, {"IC 4725", "M 25", "Col 382", "Lyn 803"}), + (26, {"IC 1805", "Col 26", "Sh2 190", "Lyn 77"}), + (334, {"NGC 6383", "NGC 6374", "Col 334", "Col 335", "Lyn 730"}), + # "(incorrectly) 3247": Collinder 220 is not NGC 3247. + (220, {"Col 220"}), + # "2384a" is a part of NGC 2384, not NGC 2384. + (142, {"Col 142"}), + ], +) +def test_collinder_joins_the_object_it_names(sequence, listings): + db = objects_db.ObjectsDatabase() + sky_object = listing_object(db, "Col", sequence) + assert object_listings(db, sky_object["id"]) == listings + + +@pytest.mark.unit +def test_collinder_joins_keep_the_first_loaders_values(): + db = objects_db.ObjectsDatabase() + # The Messier name stays first on M 44, and Collinder's names follow. + m44 = object_names(db, listing_object(db, "Col", 189)["id"]) + assert m44[:2] == ["Beehive Cluster", "Praesepe"] + assert "2632 (M44)" not in m44 + # IC 1805 keeps its type (#676) with Collinder 26 = Melotte 15 on it. + ic1805 = listing_object(db, "Col", 26) + assert ic1805["obj_type"] == "C+N" + assert "Melotte 15" in object_names(db, ic1805["id"]) + assert object_names(db, listing_object(db, "Col", 220)["id"]) == ["Col 220"] + assert object_names(db, listing_object(db, "Col", 142)["id"]) == [ + "Col 142", + "NGC 2384a", + ] + + +@pytest.mark.unit +def test_collinder_names_hold_no_raw_column_text(): + # No placeholder, parenthesised note, comma list or bare number. + db = objects_db.ObjectsDatabase() + db.cursor.execute("SELECT DISTINCT common_name FROM names WHERE origin = 'Col';") + names = [row["common_name"] for row in db.cursor.fetchall()] + assert len(names) == 939 + raw = [ + name + for name in names + if name == "nl" or "(" in name or "," in name or name.isdigit() + ] + assert raw == [] + + @pytest.mark.unit def test_background_loader(): """ diff --git a/python/tests/test_catalog_matching.py b/python/tests/test_catalog_matching.py index 1d01a564e..586e4d0ec 100644 --- a/python/tests/test_catalog_matching.py +++ b/python/tests/test_catalog_matching.py @@ -25,8 +25,14 @@ match_guard, parse_component, ) +from PiFinder.catalog_imports.specialized_loaders import ( + collinder_names, + collinder_other_catalogs, + collinder_other_names, +) from PiFinder.composite_object import MagnitudeObject, SizeObject from PiFinder.db.objects_db import ObjectsDatabase +from PiFinder.designations import listing_named pytestmark = pytest.mark.unit @@ -670,6 +676,177 @@ def test_load_collinder_keeps_the_sign_of_minus_00(db, astro_data, monkeypatch): assert sky_object(db, "Col", 401)["dec"] == pytest.approx(-20 / 60) +# --- Collinder's two name columns --------------------------------------------- + +COLLINDER_HEADER = ( + "Col #\tNGC/Other Cat.\tCon\tRA\tDEC\tm (v/p)\t# Stars\tSize\tClass\tn\n" +) +COLLINDER2_HEADER = ( + "Collinder number\tNGC/IC number\tOther names\tImage\tObject type" + "\tConstellation\tApparent magnitude\n" +) + + +@pytest.mark.parametrize( + "raw, expected", + [ + # A bare number is an NGC number. + ("581", ["NGC 581"]), + # A second designation in parentheses. + ("581 (M103)", ["NGC 581", "M 103"]), + ("6374 (6383)", ["NGC 6374", "NGC 6383"]), + ("IC4725 (M25)", ["IC 4725", "M 25"]), + ("Mel 15 (IC1805)", ["Melotte 15", "IC 1805"]), + # IC and Messier designations get their space. + ("IC1848", ["IC 1848"]), + ("M45", ["M 45"]), + # The catalogs that the file abbreviates are written out. + ("Tr.9", ["Trumpler 9"]), + ("Tr 16", ["Trumpler 16"]), + ("Mel.111", ["Melotte 111"]), + ("Harv.5", ["Harvard 5"]), + ("Melotte 186", ["Melotte 186"]), + # A part of an NGC object: a name, which the import joins to nothing. + ("2384a", ["NGC 2384a"]), + # A name stays as written; "Cl." is "Cluster". + ("Orion Cluster", ["Orion Cluster"]), + ("Ursa Major", ["Ursa Major"]), + ("Markarian 18", ["Markarian 18"]), + ("Antares Cl.", ["Antares Cluster"]), + ("eta Car cluster (Tr 16)", ["eta Car cluster", "Trumpler 16"]), + # One designation in parentheses is a designation... + ("(Harvard 8)", ["Harvard 8"]), + # ...and any other text in parentheses is a note. + ("(Mel 72 per A/H)", []), + ("Mel 20 (PMC)", ["Melotte 20"]), + # Collinder's cross-reference was wrong: no name, so no join. + ("(incorrectly) 3247", []), + # Placeholders. + ("nl", []), + (" ", []), + ("", []), + # The Flamsteed numbers of the cluster's stars. + ("4-5 Vul.", []), + ("9-12 Gem", []), + ], +) +def test_collinder_other_catalogs(raw, expected): + assert collinder_other_catalogs(raw) == expected + + +@pytest.mark.parametrize( + "raw, expected", + [ + ("", []), + ("Pleiades", ["Pleiades"]), + ("Beehive Cluster, Praesepe", ["Beehive Cluster", "Praesepe"]), + ( + "Al Sufi's Cluster, Brocchi's Cluster, Coathanger", + ["Al Sufi's Cluster", "Brocchi's Cluster", "Coathanger"], + ), + ("[note 1]", []), + ], +) +def test_collinder_other_names(raw, expected): + assert collinder_other_names(raw) == expected + + +def test_collinder_names_lists_each_name_once(): + # collinder.txt's "Tr.9" and collinder2.txt's "Trumpler 9" are one name. + assert collinder_names("Tr.9", "Trumpler 9") == ["Trumpler 9"] + assert collinder_names("Markarian 18", "Markarian 18") == ["Markarian 18"] + assert collinder_names("eta Car cluster (Tr 16)", "Trumpler 16") == [ + "eta Car cluster", + "Trumpler 16", + ] + # A catalog abbreviation that collinder2.txt does not repeat is kept. + assert collinder_names("Mel.111", "Coma Star Cluster") == [ + "Melotte 111", + "Coma Star Cluster", + ] + assert collinder_names("4-5 Vul.", "Al Sufi's Cluster, Coathanger") == [ + "Al Sufi's Cluster", + "Coathanger", + ] + + +@pytest.mark.parametrize( + "raw, joins", + [ + ("581 (M103)", [("NGC", 581), ("M", 103)]), + ("IC4725 (M25)", [("IC", 4725), ("M", 25)]), + ("Mel 15 (IC1805)", [("IC", 1805)]), + # Trumpler, Melotte and Harvard are no PiFinder catalogs, and a part + # of an NGC object is not that object. + ("Tr.9", []), + ("(Harvard 8)", []), + ("2384a", []), + ("(incorrectly) 3247", []), + ("4-5 Vul.", []), + ], +) +def test_collinder_names_join_only_through_the_allowlist(raw, joins): + listings = [listing_named(name) for name in collinder_other_catalogs(raw)] + assert [found for found in listings if found is not None] == joins + + +def test_load_collinder_reads_its_name_columns(db, astro_data, monkeypatch): + (astro_data / "collinder.desc").write_text("Collinder") + (astro_data / "collinder.txt").write_text( + COLLINDER_HEADER + # At NGC 5194 = M 51, NGC 7000, NGC 869 and IC 1590 of the fixture. + + "1\t5194 (M51)\tCVn\t13h 29m 52.6s\t+47\u00ba 11' 42\"\t8\t20\t10\tPlei\t \n" + + "2\t(incorrectly) 7000\tCyg\t20h 59m 00.0s\t+44\u00ba 19' 48\"\t8\t20\t10\tPlei\t \n" + + "3\t869a\tPer\t02h 19m 00.0s\t+57\u00ba 07' 48\"\t8\t20\t10\tPlei\t \n" + + "4\tIC1590\tCas\t00h 52m 48.0s\t+56\u00ba 37' 48\"\t8\t20\t10\tPlei\t \n" + + "5\t4-5 Vul.\tVul\t19h 25m 24.0s\t+20\u00ba 11' 00\"\t4\t60\t15\tPlei\t \n" + + "6\tnl\tAur\t05h 22m 30.0s\t+41\u00ba 00' 00\"\t4\t28\t15\tPlei\t \n" + + "7\tHarv.5\tCru\t12h 27m 10.0s\t-60\u00ba 46' 00\"\t7\t5\t25\tPlei\t \n" + ) + (astro_data / "collinder2.txt").write_text( + COLLINDER2_HEADER + + "Cr 1\tNGC 5194\tWhirlpool Cluster\t\tOpen cluster\tCanes Venatici\t8.0\n" + + "Cr 2\t-\t\t\tOpen cluster\tCygnus\t8.0\n" + + "Cr 3\t-\t\t\tOpen cluster\tPerseus\t8.0\n" + + "Cr 4\tIC 1590\t[note 1]\t\tOpen cluster\tCassiopeia\t8.0\n" + + "Cr 5\t-\tAl Sufi's Cluster, Brocchi's Cluster, Coathanger\t\tAsterism" + "\tVulpecula\t3.6\n" + + "Cr 6\t-\t\t\tOpen cluster\tAuriga\t4.2\n" + + "Cr 7\t-\t\t\tOpen cluster\tCrux\t7.1\n" + ) + monkeypatch.setattr(specialized_loaders, "objects_db", db) + specialized_loaders.load_collinder() + + # "5194 (M51)" is two designations: the listing joins their sky object. + assert object_of(db, "Col", 1) == object_of(db, "NGC", 5194) + assert names(db, "Col", 1) == [ + "NGC 5194", + "Col 1", + "NGC 5194", + "M 51", + "Whirlpool Cluster", + ] + # Collinder's wrong cross-reference: no join and no name. + assert object_of(db, "Col", 2) != object_of(db, "NGC", 7000) + assert names(db, "Col", 2) == ["Col 2"] + # A part of NGC 869 is a name, not a join. + assert object_of(db, "Col", 3) != object_of(db, "NGC", 869) + assert names(db, "Col", 3) == ["Col 3", "NGC 869a"] + # An IC designation joins as before, and its name has a space. + assert object_of(db, "Col", 4) == object_of(db, "IC", 1590) + assert names(db, "Col", 4) == ["IC 1590", "Col 4", "IC 1590"] + # A comma list is separate names; the star numbers are no name. + assert names(db, "Col", 5) == [ + "Col 5", + "Al Sufi's Cluster", + "Brocchi's Cluster", + "Coathanger", + ] + assert names(db, "Col", 6) == ["Col 6"] + assert names(db, "Col", 7) == ["Col 7", "Harvard 5"] + assert ciu.MATCH_REJECTIONS == [] + + def test_load_caldwell_keeps_the_sign_of_minus_0(db, astro_data, monkeypatch): (astro_data / "caldwell.desc").write_text("Caldwell") (astro_data / "caldwell.dat").write_text( diff --git a/python/tests/test_catalog_star_identity.py b/python/tests/test_catalog_star_identity.py index 577d4f953..619539a65 100644 --- a/python/tests/test_catalog_star_identity.py +++ b/python/tests/test_catalog_star_identity.py @@ -741,7 +741,7 @@ def test_a_wds_double_makes_a_merged_star_d_star(db): assert sky_object(db, "SaR", 161)["obj_type"] == "D*" -def test_a_star_wds_lists_only_with_optical_companions_is_single(db): +def test_a_star_wds_lists_only_with_dubious_companions_is_single(db): add(db, "Str", 77, "*", 200.975, 54.9167, mag=[2.2]) add(db, "TLK", 1, "*", 200.98, 54.925, mag=[2.0, 2.5]) add(db, "WDS", 94640, "*", 200.98, 54.925, mag=[2.2, 9.5]) @@ -773,28 +773,30 @@ def wds_pair(components="AB", notes="N", sep=1.9, mag1=3.5, mag2=6.2): # Propus's BU 1008, with an orbit. (wds_pair(notes="NC"), True), (wds_pair(components=""), True), - (wds_pair(components="Aa,Ab", sep=0.5), True), - # Too close to split: Capella's, Algol's and Dschubba's pairs. - (wds_pair(components="Aa,Ab", sep=0.33), False), - (wds_pair(notes="NO", sep=0.076), False), - # Flagged optical or dubious: Vega's H 5 39 (U), Arcturus's HDS 2003 (X). - (wds_pair(notes="NL U"), False), - (wds_pair(notes="NS"), False), + # Flagged optical: Vega's H 5 39 (U), STFB 9 (S); and L, Y. + (wds_pair(notes="NL U"), True), + (wds_pair(notes="NS"), True), + (wds_pair(notes="L"), True), + (wds_pair(notes="Y"), True), + # A companion more than 5 mag fainter: σ CMa's 14.2 at 11". + (wds_pair(sep=11.1, mag1=3.5, mag2=14.2), True), + # Closer than 0.5": Capella's, Algol's and Dschubba's pairs. + (wds_pair(components="Aa,Ab", sep=0.33), True), + (wds_pair(notes="NO", sep=0.076), True), + # Wider than 60": Alphard's 9.7 at 284". + (wds_pair(sep=284.4, mag1=2.0, mag2=9.7), True), + # Without the primary: Vega's STF 3136 BC. + (wds_pair(components="BC"), True), + # No separation, or no primary magnitude: WDS still lists the pair. + (wds_pair(sep=np.nan), True), + (wds_pair(mag1=np.nan, mag2=9.0), True), + # Flagged dubious: Arcturus's HDS 2003, ζ Scl's B 631 (NX). (wds_pair(notes="X"), False), - (wds_pair(notes="Y"), False), - # Not the primary's pair: Vega's STF 3136 BC. - (wds_pair(components="BC"), False), - # A companion no observer looks for: Alphard's 9.7 at 284", - # σ CMa's 14.2 at 11". - (wds_pair(sep=284.4, mag1=2.0, mag2=9.7), False), - (wds_pair(sep=11.1, mag1=3.5, mag2=14.2), False), - # Exactly 5 mag fainter passes, though 18.6 - 13.6 is - # 5.000000000000002 in floating point (WDS 02594+4847). - (wds_pair(sep=10.0, mag1=13.6, mag2=18.6), True), - (wds_pair(sep=10.0, mag1=13.6, mag2=18.61), False), - (wds_pair(sep=np.nan), False), + (wds_pair(notes="NX"), False), + (wds_pair(notes="NL X"), False), + # No companion magnitude. (wds_pair(mag2=np.nan), False), - (wds_pair(mag1=np.nan, mag2=9.0), True), + (wds_pair(components="Aa,Ab", sep=0.354, mag1=9.07, mag2=np.nan), False), ], ) def test_is_double_star_pair(pair, double): diff --git a/python/tests/test_catalog_star_loaders.py b/python/tests/test_catalog_star_loaders.py index 8f73ffdf6..5f78b35af 100644 --- a/python/tests/test_catalog_star_loaders.py +++ b/python/tests/test_catalog_star_loaders.py @@ -372,13 +372,17 @@ def test_load_wds_keeps_a_missing_companion_magnitude_out(wds): def test_load_wds_types_a_listing_by_its_pairs(wds): - # Vega's pairs are all flagged optical; Propus's BU 1008 is a double. - assert listing(wds, "WDS", 1)["obj_type"] == "*" + # Every pair WDS lists is a double: Vega's, all flagged optical, and + # each a companion more than 5 mag fainter or wider than 60". + assert listing(wds, "WDS", 1)["obj_type"] == "D*" + # Propus's BU 1008. assert listing(wds, "WDS", 5)["obj_type"] == "D*" - # SHN 45 is 0.16" wide, too close to split. - assert listing(wds, "WDS", 2)["obj_type"] == "*" - # No companion magnitude, or a companion 1234" away: no double star. - assert listing(wds, "WDS", 3)["obj_type"] == "*" + # SHN 45 is 0.16" wide. + assert listing(wds, "WDS", 2)["obj_type"] == "D*" + # One pair has no companion magnitude; the other is 1234" wide. + assert listing(wds, "WDS", 3)["obj_type"] == "D*" + # LDS 2101's only pair is flagged dubious (X). + assert listing(wds, "WDS", 4)["obj_type"] == "*" def test_load_wds_records_a_row_placed_by_its_identifier(wds): diff --git a/release_notes/2.6.4-catalog.md b/release_notes/2.6.4-catalog.md new file mode 100644 index 000000000..8e5d3148c --- /dev/null +++ b/release_notes/2.6.4-catalog.md @@ -0,0 +1,28 @@ +# PiFinder 2.6.4: Catalog Changes + +This release replaces PiFinder's object database with a new build. We checked every catalog against its published sources, fixed what was wrong, and cited a source for each fix. Most changes are small, but together they touch thousands of objects. The full record is in [#670](https://github.com/brickbots/PiFinder/issues/670) and the rebuild in [#697](https://github.com/brickbots/PiFinder/pull/697). + +## What you will notice + +- **One star, one object.** A star that several catalogs list (Bright Named, SAC Doubles, SAC Red Stars, RASC Doubles, the variable stars, WDS) is now a single object. Mizar is one double star, not three separate objects. Every catalog entry still opens it, and object details still step through its entries. +- **Accurate star positions and brightness.** Each of these stars now takes its position from the Hipparcos star catalog, and its magnitude too where Hipparcos measured that star alone. +- **Official star names.** Stars show their IAU name first, for example Acrab, not Graffias. Older names still work in search. +- **A new Named Stars catalog** (Objects → By Catalog → Stars…) lists all 578 stars with an IAU name, numbered by their Hipparcos number: Vega is Nam 91262. 213 of them were not in PiFinder before, among them Miaplacidus, Naos and Pherkad. +- **Star lists open with names shown.** Planets, comets and the star, double-star, asterism and variable-star catalogs open in the names view, with real names before catalog numbers. SQUARE still changes the view. +- **The magnitude filter no longer hides bright double stars.** A double now filters by its brighter star, not by the average of the two. +- **Double stars follow WDS.** A star is a double star if WDS lists it in a pair, unless WDS marks every pair it has as dubious, or gives no magnitude for the companion; those are now single stars. A bright star that WDS lists, such as Vega or Canopus, is one double-star object. Each entry shows its separation and both magnitudes, so you can judge whether you can split it. +- **Better names and types for deep-sky objects.** Messier objects show their common name first (M 82 is the Cigar Galaxy). NGC/IC numbers that point at nothing are marked "Not found". Duplicate entries now share one object. For example, Collinder 189 is the same object as M 44. +- **Observing lists** read designations the same way as the catalog. "Cr 399" and "Collinder 399" both find the Coathanger, and an ambiguous name such as "H 24" no longer finds the wrong object. +- In any object list you can now type up to six digits to jump to a number. + +## Things that moved or went away + +- **About 1,500 entries moved by more than 5′.** Most are WDS double stars just south of the celestial equator, which the old import placed north of it. Sharpless objects now use their J2000 positions. +- **Five SAC Doubles entries are gone** (SaM 149, 729, 779, 1585 and 2056). SAC marks them as rejected pairs. Each star is still in the database through its WDS entry. +- **Still missing:** Barnard's six "a" dark nebulae (B 44a and others, [#665](https://github.com/brickbots/PiFinder/issues/665)). They are planned for a later release. + +## Your data + +Your observation log and saved observing lists keep working. They store catalog designations, which have not changed. An observation of a removed SaM entry stays in your log but no longer marks an object as observed. The first start after the update takes a little longer while PiFinder builds its catalog cache again. + +Thanks to @mrosseel for a detailed review of this work.