Skip to content

Replace deprecated pkg_resources package with importlib #56

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
avigan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Replace deprecated pkg_resources package with importlib #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 11 additions & 12 deletions htof/parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
from math import ceil, floor
import xml.etree.ElementTree as ET
from datetime import datetime, timedelta
import pkg_resources
from importlib.resources import files

from astropy.time import Time
from astropy.table import QTable, Column, Table
Expand Down Expand Up @@ -195,7 +195,7 @@ def download_gost_data(self, star_id):
# parse xml text to pandas DataFrame
data = self.parse_xml(response)
if data is None:
raise RuntimeError("Can not parse data. The Hipparcos star ID is likely invalid.")
raise RuntimeError("Can not parse data. The Hipparcos star ID is likely invalid.")
# keep first astronomic field hit of each observation
data = self.keep_field_hits(data)
return data
Expand Down Expand Up @@ -248,12 +248,12 @@ def parse_xml(self, response):
data = pd.DataFrame(rows, columns=columns)
data = data.astype({"Target": str,"ra[rad]": float, "dec[rad]": float,"ra[h:m:s]": str,"dec[d:m:s]": str,"ObservationTimeAtGaia[UTC]": str,"CcdRow[1-7]": int,"zetaFieldAngle[rad]": float,"scanAngle[rad]": float,"Fov[FovP=preceding/FovF=following]": str,"parallaxFactorAlongScan": float,"parallaxFactorAcrossScan": float,"ObservationTimeAtBarycentre[BarycentricJulianDateInTCB]": float })
return data

def keep_field_hits(self, data):
"""
Gost files downloaded from the web through REST contain sequences of ten observations, for every observation of the
star in the scanning law. The first entry is the skymapper CCD hit, and the extra entries are redundant
(the hits for astrometric field CCD's 1 through 9). Only the second observation of each sequence should be saved.
star in the scanning law. The first entry is the skymapper CCD hit, and the extra entries are redundant
(the hits for astrometric field CCD's 1 through 9). Only the second observation of each sequence should be saved.
This function saves the second observation (this is the hit on the first astrometric field CCD (AF1)).
"""
format = "%Y-%m-%dT%H:%M:%S.%f"
Expand Down Expand Up @@ -380,7 +380,7 @@ def download_hip_data(self, star_id):
"or download this file manually using the HIP Catalogue online interface.")
data = parse_html(response)
if data is None:
raise RuntimeError("Can not parse data. The Hipparcos star ID is likely invalid.")
raise RuntimeError("Can not parse data. The Hipparcos star ID is likely invalid.")
return data

def save_hip_data(self, star_id: str, data: str, intermediate_data_directory: str):
Expand Down Expand Up @@ -428,7 +428,7 @@ def parse(self, star_id, intermediate_data_directory, data_choice='MERGED'):
# compute scan angles and observations epochs according to van Leeuwen & Evans 1998
# 10.1051/aas:1998218, eq. 11 & 12.
self.scan_angle = np.arctan2(data['IA3'], data['IA4']) # unit radians, arctan2(sin, cos)
# Use the larger denominator when computing the epoch offset.
# Use the larger denominator when computing the epoch offset.
# This increases numerical precision and avoids NaNs if one of the two fields (IA3, IA4) is exactly zero.
self._epoch = 1991.25 + (data['IA6'] / data['IA3']).where(abs(data['IA3']) > abs(data['IA4']), (data['IA7'] / data['IA4']))
self.residuals = data['IA8'] # unit milli-arcseconds (mas)
Expand Down Expand Up @@ -487,7 +487,7 @@ def parse(self, star_id, intermediate_data_directory, error_inflate=True, header
is given in the equatorial system. This is similar to the original
Hipparcos and Gaia (Source: private communication between Daniel
Michalik and Floor van Leeuwen, April 2019), which define the scan angle theta
as East of the North equatorial pole. theta = pi / 2 - psi,
as East of the North equatorial pole. theta = pi / 2 - psi,
see Brandt et al. (2021), Section 2.2.2."
"""
self.meta['star_id'] = star_id
Expand Down Expand Up @@ -570,8 +570,7 @@ def rejected_epochs(self, value):


class HipparcosRereductionJavaTool(HipparcosRereductionDVDBook):
EPOCHREJECTLIST = Table.read(pkg_resources.resource_filename('htof',
'data/epoch_reject_shortlist.csv'), format='ascii')
EPOCHREJECTLIST = Table.read(files('htof') / 'data' / 'epoch_reject_shortlist.csv', format='ascii')

def __init__(self, scan_angle=None, epoch=None, residuals=None, inverse_covariance_matrix=None,
along_scan_errs=None, meta=None):
Expand Down Expand Up @@ -685,7 +684,7 @@ def parse(self, star_id, intermediate_data_directory, error_inflate=True, attemp


class GaiaDR2(GaiaData):
DEAD_TIME_TABLE_NAME = pkg_resources.resource_filename('htof', 'data/astrometric_gaps_gaiadr2_08252020.csv')
DEAD_TIME_TABLE_NAME = files('htof') / 'data' / 'astrometric_gaps_gaiadr2_08252020.csv'

def __init__(self, scan_angle=None, epoch=None, residuals=None, inverse_covariance_matrix=None, meta=None,
min_epoch=st.GaiaDR2_min_epoch, max_epoch=st.GaiaDR2_max_epoch, along_scan_errs=None):
Expand All @@ -696,7 +695,7 @@ def __init__(self, scan_angle=None, epoch=None, residuals=None, inverse_covarian


class GaiaeDR3(GaiaData):
DEAD_TIME_TABLE_NAME = pkg_resources.resource_filename('htof', 'data/astrometric_gaps_gaiaedr3_12232020.csv')
DEAD_TIME_TABLE_NAME = files('htof') / 'data' / 'astrometric_gaps_gaiaedr3_12232020.csv'

def __init__(self, scan_angle=None, epoch=None, residuals=None, inverse_covariance_matrix=None, meta=None,
min_epoch=st.GaiaeDR3_min_epoch, max_epoch=st.GaiaeDR3_max_epoch, along_scan_errs=None):
Expand Down
7 changes: 3 additions & 4 deletions htof/special_parse.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import numpy as np
import warnings
import pkg_resources
from importlib.resources import files
from pandas import DataFrame, Series
from shutil import copy
from copy import deepcopy
Expand All @@ -26,8 +26,7 @@ class Hipparcos2Recalibrated(HipparcosRereductionJavaTool):
hipparcos 2 IAD.

"""
EPOCHREJECTLIST = Table.read(pkg_resources.resource_filename('htof',
'data/epoch_reject_shortlist.csv'), format='ascii')
EPOCHREJECTLIST = Table.read(files('htof') / 'data' / 'epoch_reject_shortlist.csv', format='ascii')

def __init__(self, scan_angle=None, epoch=None, residuals=None, inverse_covariance_matrix=None,
along_scan_errs=None, meta=None, residual_offset=0.141, cosmic_dispersion=2.25):
Expand Down Expand Up @@ -153,7 +152,7 @@ def write_as_javatool_format(self, path: str):
(56, 61), (63, 68), (70, 75), (77, 82), (84, 89), (91, 96),
(98, 103), (105, 110), (114, 119), (123, 128), (131, 136), (139, 144),
(149, 154), (159, 164), (167, 172), (175, 180), (184, 189), (193, 198)]
header_template_fpath = pkg_resources.resource_filename('htof', 'data/hip2_recalibrated_header.txt')
header_template_fpath = files('htof') / 'data' / 'hip2_recalibrated_header.txt'
copy(header_template_fpath, path) # copy the template file to the output path.
# populate the header lines.
f = open(path, 'r')
Expand Down