arvi 0.1.25__py3-none-any.whl → 0.1.27__py3-none-any.whl

arvi/dace_wrapper.py

@@ -11,16 +11,33 @@ from .setup_logger import logger
 from .utils import create_directory, all_logging_disabled, stdout_disabled, tqdm
 
 
-def load_spectroscopy() -> SpectroscopyClass:
+def load_spectroscopy(user=None) -> SpectroscopyClass:
     from .config import config
+    # requesting as public
     if config.request_as_public:
         with all_logging_disabled():
             dace = DaceClass(dace_rc_config_path='none')
         return SpectroscopyClass(dace_instance=dace)
+    # DACERC environment variable is set, should point to a dacerc file with credentials
     if 'DACERC' in os.environ:
         dace = DaceClass(dace_rc_config_path=os.environ['DACERC'])
         return SpectroscopyClass(dace_instance=dace)
-    # elif os.path.exists(os.path.expanduser('~/.dacerc')):
+    # user provided, should be a section in ~/.dacerc
+    if user is not None:
+        import configparser
+        import tempfile
+        config = configparser.ConfigParser()
+        config.read(os.path.expanduser('~/.dacerc'))
+        if user not in config.sections():
+            raise ValueError(f'Section for user "{user}" not found in ~/.dacerc')
+        with tempfile.NamedTemporaryFile(mode='w', delete=False) as f:
+            new_config = configparser.ConfigParser()
+            new_config['user'] = config[user]
+            new_config.write(f)
+        dace = DaceClass(dace_rc_config_path=f.name)
+        logger.info(f'using credentials for user {user} in ~/.dacerc')
+        return SpectroscopyClass(dace_instance=dace)
+    # default
     return default_Spectroscopy
 
 @lru_cache()
@@ -70,7 +87,6 @@ def get_arrays(result, latest_pipeline=True, ESPRESSO_mode='HR11', NIRPS_mode='H
             if verbose and npipe > 1:
                 logger.info(f'selecting latest pipeline ({pipelines[0]}) for {inst}')
 
-
         for pipe in pipelines:
             modes = [m for m in result[inst][pipe].keys()]
 
@@ -85,24 +101,19 @@ def get_arrays(result, latest_pipeline=True, ESPRESSO_mode='HR11', NIRPS_mode='H
                     if verbose:
                         logger.warning(f'no observations for requested NIRPS mode ({NIRPS_mode})')
 
-            # HARPS15 observations should not be separated by 'mode' if some are
-            # done together with NIRPS
-            if 'HARPS15' in inst:
+            # HARPS observations should not be separated by 'mode' if some are
+            # done together with NIRPS, but should be separated by 'EGGS' mode
+            if 'HARPS' in inst:
+                m0 = modes[0]
+                data = {
+                    k: np.concatenate([result[inst][pipe][m][k] for m in modes])
+                    for k in result[inst][pipe][m0].keys()
+                }
                 if 'HARPS+NIRPS' in modes:
-                    m0 = modes[0]
-                    data = {
-                        k: np.concatenate([result[inst][pipe][m][k] for m in modes])
-                        for k in result[inst][pipe][m0].keys()
-                    }
                     arrays.append( ((str(inst), str(pipe), str(m0)), data) )
                     continue
 
-                if 'EGGS+NIRPS' in modes:
-                    m0 = modes[0]
-                    data = {
-                        k: np.concatenate([result[inst][pipe][m][k] for m in modes])
-                        for k in result[inst][pipe][m0].keys()
-                    }
+                if 'EGGS+NIRPS' in modes or 'EGGS' in modes:
                     arrays.append( ((str(inst + '_EGGS'), str(pipe), str(m0)), data) )
                     continue
 
@@ -117,7 +128,7 @@ def get_arrays(result, latest_pipeline=True, ESPRESSO_mode='HR11', NIRPS_mode='H
 
     return arrays
 
-def get_observations_from_instrument(star, instrument, main_id=None, verbose=True):
+def get_observations_from_instrument(star, instrument, user=None, main_id=None, verbose=True):
     """ Query DACE for all observations of a given star and instrument
 
     Args:
@@ -125,6 +136,8 @@ def get_observations_from_instrument(star, instrument, main_id=None, verbose=Tru
             name of the star
         instrument (str):
             instrument name
+        user (str, optional):
+            DACERC user name. Defaults to None.
         main_id (str, optional):
             Simbad main id of target to query DACE id. Defaults to None.
         verbose (bool, optional):
@@ -138,7 +151,7 @@ def get_observations_from_instrument(star, instrument, main_id=None, verbose=Tru
         dict:
             dictionary with data from DACE
     """
-    Spectroscopy = load_spectroscopy()
+    Spectroscopy = load_spectroscopy(user)
     found_dace_id = False
     try:
         dace_id = get_dace_id(star, verbose=verbose)
@@ -239,9 +252,9 @@ def get_observations_from_instrument(star, instrument, main_id=None, verbose=Tru
     # print([r[k1][k2].keys() for k1 in r.keys() for k2 in r[k1].keys()])
     return r
 
-def get_observations(star, instrument=None, main_id=None, verbose=True):
+def get_observations(star, instrument=None, user=None, main_id=None, verbose=True):
     if instrument is None:
-        Spectroscopy = load_spectroscopy()
+        Spectroscopy = load_spectroscopy(user)
         try:
             with stdout_disabled(), all_logging_disabled():
                 result = Spectroscopy.get_timeseries(target=star,
@@ -255,7 +268,7 @@ def get_observations(star, instrument=None, main_id=None, verbose=True):
             raise ValueError(msg) from None
     else:
         try:
-            result = get_observations_from_instrument(star, instrument, main_id, verbose)
+            result = get_observations_from_instrument(star, instrument, user, main_id, verbose)
         except ValueError:
             msg = f'no {instrument} observations for {star}'
             raise ValueError(msg) from None
@@ -339,6 +352,12 @@ def check_existing(output_directory, files, type):
         if type in f
     ]
 
+    if type == 'S2D':
+        existing = [
+            f.partition('.fits')[0] for f in os.listdir(output_directory)
+            if 'e2ds' in f
+        ]   
+
     # also check for lowercase type
     existing += [
         f.partition('.fits')[0] for f in os.listdir(output_directory)
@@ -351,7 +370,8 @@ def check_existing(output_directory, files, type):
     
     # remove type of file (e.g. _CCF_A)
     existing = [f.partition('_')[0] for f in existing]
-    
+    existing = np.unique(existing)
+
     missing = []
     for file in files:
         if any(other in file for other in existing):
@@ -360,9 +380,9 @@ def check_existing(output_directory, files, type):
 
     return np.array(missing)
 
-def download(files, type, output_directory, output_filename=None, quiet=True, pbar=None):
+def download(files, type, output_directory, output_filename=None, user=None, quiet=True, pbar=None):
     """ Download files from DACE """
-    Spectroscopy = load_spectroscopy()
+    Spectroscopy = load_spectroscopy(user)
     if isinstance(files, str):
         files = [files]
     if quiet:
@@ -439,7 +459,7 @@ def do_symlink_filetype(type, raw_files, output_directory, clobber=False, top_le
             logger.warning(f'file not found: {file}')
 
 
-def do_download_filetype(type, raw_files, output_directory, clobber=False,
+def do_download_filetype(type, raw_files, output_directory, clobber=False, user=None,
                          verbose=True, chunk_size=20, parallel_limit=30):
     """ Download CCFs / S1Ds / S2Ds from DACE """
     raw_files = np.atleast_1d(raw_files)
@@ -475,7 +495,7 @@ def do_download_filetype(type, raw_files, output_directory, clobber=False,
     if n < parallel_limit:
         iterator = [raw_files[i:i + chunk_size] for i in range(0, n, chunk_size)]
         for files in tqdm(iterator, total=len(iterator)):
-            download(files, type, output_directory, quiet=False)
+            download(files, type, output_directory, quiet=False, user=user)
             extract_fits(output_directory)
 
     else:
@@ -487,7 +507,7 @@ def do_download_filetype(type, raw_files, output_directory, clobber=False,
         chunks = list(chunker(raw_files, chunk_size))
         pbar = tqdm(total=len(chunks))
         it1 = [
-            (files, type, output_directory, f'spectroscopy_download{i+1}.tar.gz', True, pbar)
+            (files, type, output_directory, f'spectroscopy_download{i+1}.tar.gz', user, True, pbar)
             for i, files in enumerate(chunks)
         ]
         it2 = [(output_directory, f'spectroscopy_download{i+1}.tar.gz') for i in range(len(chunks))]

arvi/extra_data.py

@@ -10,7 +10,8 @@ refs = {
     'HD86226': 'Teske et al. 2020 (AJ, 160, 2)'
 }
 
-def get_extra_data(star, instrument=None, path=None, verbose=True):
+def get_extra_data(star, instrument=None, path=None, verbose=True,
+                   check_for_kms=True):
     if path is None:
         path = os.path.dirname(__file__)
         path = os.path.join(path, 'data', 'extra')
@@ -18,7 +19,7 @@ def get_extra_data(star, instrument=None, path=None, verbose=True):
     metadata = json.load(open(os.path.join(path, 'metadata.json'), 'r'))
     # print(metadata)
 
-    files = glob(os.path.join(path, star + '*'))
+    files = glob(os.path.join(path, star.replace(' ', '') + '*.rdb'))
     files = [f for f in files if os.path.isfile(f)]
     files = [f for f in files if not os.path.basename(f).endswith('.zip')]
 
@@ -57,9 +58,24 @@ def get_extra_data(star, instrument=None, path=None, verbose=True):
             if 'corrected_for_secular_acceleration' in metadata[file_basename]:
                 did_sa[i] = metadata[file_basename]['corrected_for_secular_acceleration']
 
-    s = timeseries.RV.from_rdb(files[0], star=star, instrument=instruments[0], units=units[0])
-    for file, instrument, unit in zip(files[1:], instruments[1:], units[1:]):
-        s = s + timeseries.RV.from_rdb(file, star=star, instrument=instrument, units=unit)
+    with logger.contextualize(indent='  '):
+        s = timeseries.RV.from_rdb(files[0], star=star, instrument=instruments[0], units=units[0])
+        if check_for_kms and s.svrad.min() < 0.01:
+            units[0] = 'kms'
+            s = timeseries.RV.from_rdb(files[0], star=star, instrument=instruments[0], units=units[0])
+        if verbose:
+            logger.info(f'{instruments[0]:>12s} ├ ({s.N} observations)')
+
+        for file, instrument, unit in zip(files[1:], instruments[1:], units[1:]):
+            _s = timeseries.RV.from_rdb(file, star=star, instrument=instrument, units=unit)
+            if check_for_kms and _s.svrad.min() < 0.01:
+                unit = 'kms'
+                _s = timeseries.RV.from_rdb(file, star=star, instrument=instrument, units=unit)
+            if verbose:
+                logger.info(f'{instrument:>12s} ├ ({_s.N} observations)')
+
+            s = s + _s
+
 
     for i, (inst, ref, inst_did_sa) in enumerate(zip(s.instruments, reference, did_sa)):
         _s = getattr(s, inst)

arvi/gaia_wrapper.py

@@ -9,7 +9,11 @@ DATA_PATH = os.path.dirname(__file__)
 DATA_PATH = os.path.join(DATA_PATH, 'data')
 
 QUERY = """
-SELECT TOP 20 gaia_source.designation,gaia_source.source_id,gaia_source.ra,gaia_source.dec,gaia_source.parallax,gaia_source.pmra,gaia_source.pmdec,gaia_source.ruwe,gaia_source.phot_g_mean_mag,gaia_source.bp_rp,gaia_source.radial_velocity,gaia_source.phot_variable_flag,gaia_source.non_single_star,gaia_source.has_xp_continuous,gaia_source.has_xp_sampled,gaia_source.has_rvs,gaia_source.has_epoch_photometry,gaia_source.has_epoch_rv,gaia_source.has_mcmc_gspphot,gaia_source.has_mcmc_msc,gaia_source.teff_gspphot,gaia_source.logg_gspphot,gaia_source.mh_gspphot,gaia_source.distance_gspphot,gaia_source.azero_gspphot,gaia_source.ag_gspphot,gaia_source.ebpminrp_gspphot
+SELECT TOP 20 gaia_source.designation, gaia_source.source_id,
+              gaia_source.ra, gaia_source.dec, 
+              gaia_source.parallax, gaia_source.pmra, gaia_source.pmdec,
+              gaia_source.ruwe, gaia_source.phot_g_mean_mag, gaia_source.bp_rp, 
+              gaia_source.radial_velocity, gaia_source.radial_velocity_error
 FROM gaiadr3.gaia_source 
 WHERE 
 CONTAINS(
@@ -23,7 +27,11 @@ CONTAINS(
 """
 
 QUERY_ID = """
-SELECT TOP 20 gaia_source.designation,gaia_source.source_id,gaia_source.ra,gaia_source.dec,gaia_source.parallax,gaia_source.pmra,gaia_source.pmdec,gaia_source.ruwe,gaia_source.phot_g_mean_mag,gaia_source.bp_rp,gaia_source.radial_velocity,gaia_source.phot_variable_flag,gaia_source.non_single_star,gaia_source.has_xp_continuous,gaia_source.has_xp_sampled,gaia_source.has_rvs,gaia_source.has_epoch_photometry,gaia_source.has_epoch_rv,gaia_source.has_mcmc_gspphot,gaia_source.has_mcmc_msc,gaia_source.teff_gspphot,gaia_source.logg_gspphot,gaia_source.mh_gspphot,gaia_source.distance_gspphot,gaia_source.azero_gspphot,gaia_source.ag_gspphot,gaia_source.ebpminrp_gspphot
+SELECT TOP 20 gaia_source.designation, gaia_source.source_id,
+              gaia_source.ra, gaia_source.dec, 
+              gaia_source.parallax, gaia_source.pmra, gaia_source.pmdec,
+              gaia_source.ruwe, gaia_source.phot_g_mean_mag, gaia_source.bp_rp, 
+              gaia_source.radial_velocity, gaia_source.radial_velocity_error
 FROM gaiadr3.gaia_source 
 WHERE 
 gaia_source.source_id = {id}
@@ -31,6 +39,7 @@ gaia_source.source_id = {id}
 
 translate = {
     'Proxima': '5853498713190525696',
+    'GJ699': '4472832130942575872',
     'LS II +14 13': '4318465066420528000',
 }
 
@@ -81,7 +90,7 @@ class gaia:
         pmra = simbad.pmra
         pmdec = simbad.pmdec
         rv = simbad.rvz_radvel
-        args = dict(ra=ra, dec=dec, plx=plx, pmra=pmra, pmdec=pmdec, rv=rv)          
+        args = dict(ra=ra, dec=dec, plx=plx, pmra=pmra, pmdec=pmdec, rv=rv) 
 
         try:
             if star in translate:
@@ -109,6 +118,10 @@ class gaia:
             self.radial_velocity = float(results['radial_velocity'])
         except ValueError:
             self.radial_velocity = None
+        try:
+            self.radial_velocity_error = float(results['radial_velocity_error'])
+        except ValueError:
+            self.radial_velocity_error = None
 
         return
 

arvi/plots.py

@@ -6,7 +6,7 @@ import numpy as np
 from astropy.timeseries import LombScargle
 
 from .setup_logger import logger
-from . import config
+from .config import config
 from .stats import wmean
 
 from .utils import lazy_import
@@ -123,8 +123,12 @@ def clickable_legend(fig, ax, leg):
                 h = handles[labels.index(artist.get_text())]
                 alpha_text = {None:0.2, 1.0: 0.2, 0.2:1.0}[artist.get_alpha()]
                 alpha_point = {None: 0.0, 1.0: 0.0, 0.2: 1.0}[artist.get_alpha()]
-                h[0].set_alpha(alpha_point)
-                h[2][0].set_alpha(alpha_point)
+                try:
+                    h[0].set_alpha(alpha_point)
+                    h[2][0].set_alpha(alpha_point)
+                except TypeError:
+                    h.set_alpha(alpha_point)
+
                 artist.set_alpha(alpha_text)
                 fig.canvas.draw()
             except ValueError:
@@ -488,14 +492,15 @@ def plot_quantity(self, quantity, ax=None, show_masked=False, instrument=None,
 
 
 plot_fwhm = partialmethod(plot_quantity, quantity='fwhm')
-plot_bis = partialmethod(plot_quantity, quantity='bispan')
+plot_bispan = partialmethod(plot_quantity, quantity='bispan')
 plot_contrast = partialmethod(plot_quantity, quantity='contrast')
 plot_rhk = partialmethod(plot_quantity, quantity='rhk')
 plot_berv = partialmethod(plot_quantity, quantity='berv')
 
 
 @plot_fast
-def gls(self, ax=None, label=None, fap=True, instrument=None, adjust_means=config.adjust_means_gls,
+def gls(self, ax=None, label=None, fap=True, instrument=None, 
+        adjust_means=config.adjust_means_gls,
         picker=True, **kwargs):
     """
     Calculate and plot the Generalised Lomb-Scargle periodogram of the radial
@@ -711,7 +716,7 @@ def gls_quantity(self, quantity, ax=None, fap=True, instrument=None,
 
 
 gls_fwhm = partialmethod(gls_quantity, quantity='fwhm')
-gls_bis = partialmethod(gls_quantity, quantity='bispan')
+gls_bispan = partialmethod(gls_quantity, quantity='bispan')
 gls_rhk = partialmethod(gls_quantity, quantity='rhk')
 
 

arvi/simbad_wrapper.py

@@ -1,8 +1,15 @@
 import os
+import numpy as np
 import requests
+from dataclasses import dataclass
 
 import pysweetcat
 
+try:
+    from uncertainties import ufloat
+except ImportError:
+    ufloat = lambda x, y: x
+
 from .translations import translate
 
 DATA_PATH = os.path.dirname(__file__)
@@ -15,19 +22,35 @@ SELECT basic.OID,
        main_id,
        pmra,
        pmdec,
-       plx_value,
+       plx_value, plx_err,
        rvz_radvel,
        sp_type
 FROM basic JOIN ident ON oidref = oid
 WHERE id = '{star}';
 """
 
+# SELECT filter, flux, flux_err
+# FROM basic JOIN ident ON oid = ident.oidref JOIN flux ON oid = flux.oidref
+# WHERE id = 'HD23079';
+
 BV_QUERY = """
 SELECT B, V FROM allfluxes
 JOIN ident USING(oidref)
 WHERE id = '{star}';
 """
 
+FILTERS_QUERY = """
+SELECT filter, flux, flux_err, bibcode FROM flux 
+JOIN ident USING(oidref)
+WHERE id = '{star}';
+"""
+
+MEAS_QUERY = """
+SELECT teff, log_g, log_g_prec, fe_h, fe_h_prec, bibcode FROM mesFe_H 
+JOIN ident USING(oidref)
+WHERE id = '{star}';
+"""
+
 IDS_QUERY = """
 SELECT ids FROM ids
 JOIN ident USING(oidref)
@@ -40,6 +63,13 @@ JOIN ident ON oidref = oid
 WHERE id = '{star}';
 """
 
+@dataclass
+class Measurements:
+    teff: list
+    logg: list
+    feh: list
+    bibcode: list
+
 
 def run_query(query):
     url = 'http://simbad.u-strasbg.fr/simbad/sim-tap/sync'
@@ -52,7 +82,7 @@ def run_query(query):
         raise IndexError(err)
     return response.content.decode()
 
-def parse_table(table, cols=None, values=None):
+def parse_table1(table, cols=None, values=None):
     header = table.splitlines()[0].split('|')
     if cols is None:
         cols = list(map(str.strip, header))
@@ -66,6 +96,29 @@ def parse_table(table, cols=None, values=None):
     values = [value.replace('"', '') for value in values]
     return cols, values
 
+def parse_tablen(table, cols=None, values=None):
+    header = table.splitlines()[0].split('|')
+    cols = list(map(str.strip, header))
+    values = [list(map(str.strip, row.split('|'))) for row in table.splitlines()[2:]]
+    return cols, values
+
+def parse_value(value, err=None, prec=None):
+    try:
+        v = float(value)
+        if err:
+            try:
+                v = ufloat(float(value), float(err))
+            except ValueError:
+                pass
+        if prec:
+            try:
+                v = ufloat(float(value), 10**-int(prec))
+            except ValueError:
+                pass
+    except ValueError:
+        v = np.nan
+    return v
+
 
 effective_temperatures = {
     'F0': 7350, 'F2': 7050, 'F3': 6850, 'F5': 6700, 'F6': 6550, 'F7': 6400, 'F8': 6300, 
@@ -120,14 +173,37 @@ class simbad:
 
         try:
             table1 = run_query(query=QUERY.format(star=self.star))
-            cols, values = parse_table(table1)
+            cols, values = parse_table1(table1)
 
             table2 = run_query(query=BV_QUERY.format(star=self.star))
-            cols, values = parse_table(table2, cols, values)
+            cols, values = parse_table1(table2, cols, values)
 
             table3 = run_query(query=IDS_QUERY.format(star=self.star))
             line = table3.splitlines()[2]
             self.ids = line.replace('"', '').replace('    ', ' ').replace('   ', ' ').replace('  ', ' ').split('|')
+
+            table4 = run_query(query=FILTERS_QUERY.format(star=self.star))
+            for row in table4.splitlines()[2:]:
+                filter_name, mag, mag_err, bibcode = row.replace('"', '').split('|')
+                filter_name = filter_name.strip()
+                try:
+                    setattr(self, '_' + filter_name, ufloat(float(mag), float(mag_err)))
+                except ValueError:
+                    setattr(self, '_' + filter_name, float(mag))
+
+            # measurements table
+            table5 = run_query(query=MEAS_QUERY.format(star=self.star))
+            _teff, _logg, _feh, _bibcode = [], [], [], []
+            for row in table5.splitlines()[2:]:
+                teff, log_g, log_g_prec, fe_h, fe_h_prec, bibcode = row.replace('"', '').split('|')
+                _bibcode.append(bibcode)
+                _teff.append(parse_value(teff))
+                _logg.append(parse_value(log_g, prec=log_g_prec))
+                _feh.append(parse_value(fe_h, prec=fe_h_prec))
+
+            self.measurements = Measurements(_teff, _logg, _feh, _bibcode)
+
+
         except IndexError:
             raise ValueError(f'simbad query for {star} failed')
 
@@ -176,6 +252,9 @@ class simbad:
         sp_type = self.sp_type
         return f'{self.star} ({V=}, {sp_type=})'
 
+    @property
+    def bmv(self):
+        return self.B - self.V
 
 
 def argsort_by_spectral_type(sptypes):

arvi/timeseries.py

@@ -25,7 +25,10 @@ units = lazy_import('astropy.units')
 # from astropy import units
 
 class ExtraFields:
-    pass
+    @property
+    def fields(self):
+        return list(self.__dict__.keys())
+
 
 @dataclass
 class RV:
@@ -56,6 +59,7 @@ class RV:
     only_latest_pipeline: bool = field(init=True, repr=False, default=True)
     load_extra_data: Union[bool, str] = field(init=True, repr=False, default=False)
     check_drs_qc: bool = field(init=True, repr=False, default=True)
+    user: bool = field(init=True, repr=False, default=None)
     #
     units = 'm/s'
     _child: bool = field(init=True, repr=False, default=False)
@@ -70,13 +74,17 @@ class RV:
     _gaia = None
 
     def __repr__(self):
+        ni = len(self.instruments)
         if self.N == 0:
             return f"RV(star='{self.star}', N=0)"
+
+        i = f'{ni} instrument' + ('s' if ni > 1 else '')
+
         if self.time.size == self.mtime.size:
-            return f"RV(star='{self.star}', N={self.N})"
+            return f"RV(star='{self.star}', N={self.N}, {i})"
         else:
             nmasked = self.N - self.mtime.size
-            return f"RV(star='{self.star}', N={self.N}, masked={nmasked})"
+            return f"RV(star='{self.star}', N={self.N}, masked={nmasked}, {i})"
 
     @property
     def simbad(self):
@@ -178,7 +186,7 @@ class RV:
 
                     with timer():
                         self.dace_result = get_observations(self.__star__, self.instrument,
-                                                            main_id=mid, verbose=self.verbose)
+                                                            user=self.user, main_id=mid, verbose=self.verbose)
                 except ValueError as e:
                     # querying DACE failed, should we raise an error?
                     if self._raise_on_error:
@@ -272,11 +280,20 @@ class RV:
         # if not isinstance(other, self.__class__):
         #     raise TypeError('unsupported operand type(s) for +: '
         #                     f"'{self.__class__.__name__}' and '{other.__class__.__name__}'")
+        if other is None:
+            if inplace:
+                return
+            else:
+                return deepcopy(self)
 
         if np.isin(self.instruments, other.instruments).any():
             logger.error('the two objects share instrument(s), cannot add them')
             return
 
+        if self._did_adjust_means or other._did_adjust_means:
+            self.adjust_means()
+            other.adjust_means()
+
         if inplace:
             #? could it be as simple as this?
             for i in other.instruments:
@@ -511,18 +528,33 @@ class RV:
         Examples:
             s = RV.from_rdb('star_HARPS.rdb')
         """
+        from glob import glob
+        from os.path import splitext, basename
+
+        verbose = kwargs.pop('verbose', True)
+
         if isinstance(files, str):
-            files = [files]
+            if '*' in files:
+                files = glob(files)
+            else:
+                files = [files]
+
+        if len(files) == 0:
+            if verbose:
+                logger.error('no files found')
+            return
 
         if star is None:
-            star_ = np.unique([os.path.splitext(os.path.basename(f))[0].split('_')[0] for f in files])
+            star_ = np.unique([splitext(basename(f))[0].split('_')[0] for f in files])
             if star_.size == 1:
-                logger.info(f'assuming star is {star_[0]}')
-                star = star_[0]
+                star = star_[0].replace('-', '_')
+                if verbose:
+                    logger.info(f'assuming star is {star}')
 
         if instrument is None:
-            instruments = np.array([os.path.splitext(f)[0].split('_')[1] for f in files])
-            logger.info(f'assuming instruments: {instruments}')
+            instruments = np.array([splitext(basename(f))[0].split('_')[1] for f in files])
+            if verbose:
+                logger.info(f'assuming instruments: {instruments}')
         else:
             instruments = np.atleast_1d(instrument)
 
@@ -537,11 +569,14 @@ class RV:
             has_col = np.array([name in data.dtype.fields for name in names])
             if any(has_col):
                 col = np.where(has_col)[0][0]
-                return data[names[col]]
+                return np.atleast_1d(data[names[col]])
             return False
 
         for i, (f, instrument) in enumerate(zip(files, instruments)):
             data = np.loadtxt(f, skiprows=2, usecols=range(3), unpack=True)
+            if data.ndim == 1:
+                data = data.reshape(-1, 1)
+
             _s = cls(star, _child=True, **kwargs)
             time = data[0]
             _s.time = time
@@ -559,14 +594,20 @@ class RV:
                     names = header.split()
 
             if len(names) > 3:
-                if f.endswith('.rdb'):
-                    kw = dict(skip_header=2, dtype=None, encoding=None)
-                else:
-                    kw = dict(skip_header=0, comments='--', names=True, dtype=None, encoding=None)
+                # if f.endswith('.rdb'):
+                #     kw = dict(skip_header=2, dtype=None, encoding=None)
+                # else:
+                comments = '#'
+                kw = dict(skip_header=2, comments=comments,
+                          names=names, dtype=None, encoding=None)
                 if '\t' in header:
                     data = np.genfromtxt(f, **kw, delimiter='\t')
                 else:
                     data = np.genfromtxt(f, **kw)
+                
+                # if data.ndim in (0, 1):
+                #     data = data.reshape(-1, 1)
+
                 if len(names) == len(data.dtype.names):
                     data.dtype.names = names
             else:
@@ -580,19 +621,20 @@ class RV:
                 else:
                     _s.fwhm_err = 2 * _s.svrad
             else:
-                _s.fwhm = np.zeros_like(time)
+                _s.fwhm = np.full_like(time, np.nan)
                 _s.fwhm_err = np.full_like(time, np.nan)
 
             _quantities.append('fwhm')
             _quantities.append('fwhm_err')
 
+            # try to find R'HK and uncertainty
             if (v := find_column(data, ['rhk'])) is not False:
                 _s.rhk = v
                 _s.rhk_err = np.full_like(time, np.nan)
                 if (sv := find_column(data, ['srhk', 'rhk_err', 'sig_rhk'])) is not False:
                     _s.rhk_err = sv
             else:
-                _s.rhk = np.zeros_like(time)
+                _s.rhk = np.full_like(time, np.nan)
                 _s.rhk_err = np.full_like(time, np.nan)
 
             _quantities.append('rhk')
@@ -636,8 +678,9 @@ class RV:
 
             _s.extra_fields = ExtraFields()
             for name in data.dtype.names:
-                if name not in _quantities:
-                    name_ = name.replace(' ', '_')
+                # don't repeat some quantities
+                if name not in _quantities + ['bjd', 'rjd', 'vrad', 'svrad']:
+                    name_ = name.replace(' ', '_').replace('-', '_')
                     setattr(_s.extra_fields, name_, data[name])
                     # _quantities.append(field)
 
@@ -744,8 +787,8 @@ class RV:
         return s
 
     @classmethod
-    @lru_cache(maxsize=60)
-    def from_KOBE_file(cls, star, **kwargs):
+    # @lru_cache(maxsize=60)
+    def from_KOBE_file(cls, star, directory='.', force_download=False, **kwargs):
         assert 'KOBE' in star, f'{star} is not a KOBE star?'
         import requests
         from requests.auth import HTTPBasicAuth
@@ -766,7 +809,14 @@ class RV:
         local_targz_file = os.path.join(get_data_path(), 'KOBE_fitsfiles.tar.gz')
         fits_file = f'{star}_RVs.fits'
 
-        if os.path.exists(local_targz_file) and os.path.getmtime(local_targz_file) > pytime() - 60*60*2:
+        local_exists = os.path.exists(local_targz_file)
+        local_recent = os.path.getmtime(local_targz_file) > pytime() - 60*60*2
+
+        if os.path.exists(os.path.join(directory, fits_file)):
+            logger.info(f'found file "{fits_file}" in "{directory}"')
+            hdul = fits.open(fits_file)
+
+        elif local_exists and local_recent and not force_download:
             tar = tarfile.open(local_targz_file)
 
             if fits_file not in tar.getnames():
@@ -778,6 +828,7 @@ class RV:
         else:
             resp = requests.get(f'https://kobe.caha.es/internal/fitsfiles/{fits_file}',
                                 auth=HTTPBasicAuth('kobeteam', config.kobe_password))
+            logger.info(f'found file "{fits_file}" on server')
             
             if resp.status_code != 200:
                 # something went wrong, try to extract the file by downloading the
@@ -979,17 +1030,23 @@ class RV:
                 logger.warning('may need to provide `top_level` in kwargs to find file')
             do_symlink_filetype('CCF', files[:limit], directory, **kwargs)
         else:
-            do_download_filetype('CCF', files[:limit], directory, verbose=self.verbose, **kwargs)
+            do_download_filetype('CCF', files[:limit], directory, 
+                                 verbose=self.verbose, user=self.user, **kwargs)
 
         if load:
             try:
-                from os.path import basename, join
+                from os.path import basename, join, exists
                 from .utils import sanitize_path
                 import iCCF
                 downloaded = [
                     sanitize_path(join(directory, basename(f).replace('.fits', '_CCF_A.fits')))
                     for f in files[:limit]
                 ]
+                downloaded = [
+                    skysub 
+                    if exists(skysub := f.replace('CCF_A.fits', 'CCF_SKYSUB_A.fits')) else f
+                    for f in downloaded
+                ]
                 if self.verbose:
                     logger.info('loading the CCF(s) into `.CCF` attribute')
 
@@ -1028,7 +1085,8 @@ class RV:
                 logger.warning('may need to provide `top_level` in kwargs to find file')
             do_symlink_filetype('S1D', files[:limit], directory, **kwargs)
         else:
-            do_download_filetype('S1D', files[:limit], directory, verbose=self.verbose, **kwargs)
+            do_download_filetype('S1D', files[:limit], directory, 
+                                 verbose=self.verbose, user=self.user, **kwargs)
 
     def download_s2d(self, instrument=None, index=None, limit=None,
                      directory=None, symlink=False, **kwargs):
@@ -1060,15 +1118,50 @@ class RV:
                 logger.warning('may need to provide `top_level` in kwargs to find file')
             do_symlink_filetype('S2D', files[:limit], directory, **kwargs)
         else:
-            do_download_filetype('S2D', files[:limit], directory, verbose=self.verbose, **kwargs)
+            do_download_filetype('S2D', files[:limit], directory, 
+                                 verbose=self.verbose, user=self.user, **kwargs)
+
 
 
-    from .plots import plot, plot_fwhm, plot_bis, plot_rhk, plot_berv, plot_quantity
-    from .plots import gls, gls_fwhm, gls_bis, gls_rhk, window_function
+    from .plots import plot, plot_fwhm, plot_bispan, plot_contrast, plot_rhk, plot_berv, plot_quantity
+    from .plots import gls, gls_fwhm, gls_bispan, gls_rhk, gls_quantity, window_function
     from .reports import report
 
     from .instrument_specific import known_issues
 
+    def change_instrument_name(self, old_name, new_name, strict=False):
+        """ Change the name of an instrument
+
+        Args:
+            old_name (str):
+                The old name of the instrument
+            new_name (str):
+                The new name of the instrument, or postfix if `strict` is False
+            strict (bool):
+                Whether to match (each) `instrument` exactly
+        """
+        if new_name == '':
+            if self.verbose:
+                logger.error('new name cannot be empty string')
+            return
+
+        instruments = self._check_instrument(old_name, strict, log=True)
+        if instruments is not None:
+            several = len(instruments) >= 2
+            for instrument in instruments:
+                if several:
+                    new_name_instrument = f'{instrument}_{new_name}'
+                else:
+                    new_name_instrument = new_name
+                if self.verbose:
+                    logger.info(f'Renaming {instrument} to {new_name_instrument}')
+
+                setattr(self, new_name_instrument, getattr(self, instrument))
+                delattr(self, instrument)
+                self.instruments[self.instruments.index(instrument)] = new_name_instrument
+
+            self._build_arrays()
+
 
     def remove_instrument(self, instrument, strict=False):
         """ Remove all observations from one instrument
@@ -1212,10 +1305,9 @@ class RV:
 
     def remove_single_observations(self):
         """ Remove instruments for which there is a single observation """
-        instruments = deepcopy(self.instruments)
-        for inst in instruments:
-            if getattr(self, inst).mtime.size == 1:
-                self.remove_instrument(inst)
+        singles = [i for i in self.instruments if getattr(self, i).mtime.size == 1]
+        for inst in singles:
+            self.remove_instrument(inst, strict=True)
 
     def remove_prog_id(self, prog_id):
         """ Remove observations from a given program ID """
@@ -1697,8 +1789,52 @@ class RV:
         if config.return_self:
             return self
 
+    def detrend(self, degree=1):
+        """ Detrend the RVs of all instruments """
+        instrument_indices = np.unique_inverse(self.instrument_array).inverse_indices
+        def fun(p, t, degree, ninstruments, just_model=False, index=None):
+            polyp, offsets = p[:degree], p[-ninstruments:]
+            polyp = np.r_[polyp, 0.0]
+            if index is None:
+                model = offsets[instrument_indices] + np.polyval(polyp, t)
+            else:
+                model = offsets[index] + np.polyval(polyp, t)
+            if just_model:
+                return model
+            return self.mvrad - model
+        coef = np.polyfit(self.mtime, self.mvrad, degree)
+        x0 = np.append(coef, [0.0] * (len(self.instruments) - 1))
+        print(x0)
+        fun(x0, self.mtime, degree, len(self.instruments))
+        from scipy.optimize import leastsq
+        xbest, _ = leastsq(fun, x0, args=(self.mtime, degree, len(self.instruments)))
+
+        fig, ax = self.plot()
+        ax.remove()
+        ax = fig.add_subplot(2, 1, 1)
+        self.plot(ax=ax)
+        for i, inst in enumerate(self.instruments):
+            s = getattr(self, inst)
+            ax.plot(s.time, fun(xbest, s.time, degree, len(self.instruments), just_model=True, index=i),
+                    color=f'C{i}')
+        ax.set_title('original', loc='left', fontsize=10)
+        ax.set_title(f'coefficients: {xbest[:degree]}', loc='right', fontsize=10)
+
+        self.add_to_vrad(-fun(xbest, self.time, degree, len(self.instruments), just_model=True))
+        ax = fig.add_subplot(2, 1, 2)
+        self.plot(ax=ax)
+        ax.set_title('detrended', loc='left', fontsize=10)
+
+        # axs[0].plot(self.time, fun(xbest, self.time, degree, len(self.instruments), just_model=True))
+        # axs[1].errorbar(self.mtime, fun(xbest, self.mtime, degree, len(self.instruments)), self.msvrad, fmt='o')
+
+        return
+        
+
+
+
     def add_to_vrad(self, values):
-        """ Add a value of array of values to the RVs of all instruments """
+        """ Add a value or array of values to the RVs of all instruments """
         values = np.atleast_1d(values)
         if values.size == 1:
             values = np.full_like(self.vrad, values)
@@ -1723,7 +1859,7 @@ class RV:
 
     def add_to_quantity(self, quantity, values):
         """
-        Add a value of array of values to the given quantity of all instruments
+        Add a value or array of values to the given quantity of all instruments
         """
         if not hasattr(self, quantity):
             logger.error(f"cannot find '{quantity}' attribute")
@@ -1742,6 +1878,75 @@ class RV:
             setattr(s, quantity, getattr(s, quantity) + values[mask])
         self._build_arrays()
 
+    def replace_vrad(self, values):
+        """ Replace the RVs of all instruments with a value or array of values """
+        values = np.atleast_1d(values)
+        if values.size == 1:
+            values = np.full_like(self.vrad, values)
+
+        masked = False
+        if values.size != self.vrad.size:
+            if values.size == self.mvrad.size:
+                logger.warning('adding to masked RVs only')
+                masked = True
+            else:
+                raise ValueError(f"incompatible sizes: len(values) must equal self.N, got {values.size} != {self.vrad.size}")
+
+        for inst in self.instruments:
+            s = getattr(self, inst)
+            if masked:
+                mask = self.instrument_array[self.mask] == inst
+                s.vrad[s.mask] = values[mask]
+            else:
+                mask = self.instrument_array == inst
+                s.vrad = values[mask]
+        self._build_arrays()
+
+    def replace_svrad(self, values):
+        """ Replace the RV uncertainties of all instruments with a value or array of values """
+        values = np.atleast_1d(values)
+        if values.size == 1:
+            values = np.full_like(self.svrad, values)
+
+        masked = False
+        if values.size != self.svrad.size:
+            if values.size == self.msvrad.size:
+                logger.warning('adding to masked RV uncertainties only')
+                masked = True
+            else:
+                raise ValueError(f"incompatible sizes: len(values) must equal self.N, got {values.size} != {self.svrad.size}")
+
+        for inst in self.instruments:
+            s = getattr(self, inst)
+            if masked:
+                mask = self.instrument_array[self.mask] == inst
+                s.svrad[s.mask] = values[mask]
+            else:
+                mask = self.instrument_array == inst
+                s.svrad = values[mask]
+        self._build_arrays()
+
+    def replace_quantity(self, quantity, values):
+        """ Replace the given quantity of all instruments by a value or array of values """
+        if not hasattr(self, quantity):
+            logger.error(f"cannot find '{quantity}' attribute")
+            return
+        q = getattr(self, quantity)
+
+        values = np.atleast_1d(values)
+        if values.size == 1:
+            values = np.full_like(q, values)
+        if values.size != q.size:
+            raise ValueError(f"incompatible sizes: len(values) must equal self.N, got {values.size} != {q.size}")
+
+        for inst in self.instruments:
+            s = getattr(self, inst)
+            mask = self.instrument_array == inst
+            setattr(s, quantity, values[mask])
+        self._build_arrays()
+
+
+
     def change_units(self, new_units):
         possible = {'m/s': 'm/s', 'km/s': 'km/s', 'ms': 'm/s', 'kms': 'km/s'}
         if new_units not in possible:
@@ -1809,20 +2014,18 @@ class RV:
         """ Sort instruments by first or last observation date.
 
         Args:
-            by_first_observation (bool, optional):
+            by_first_observation (bool, optional, default=True):
                 Sort by first observation date.
-            by_last_observation (bool, optional):
-                Sort by last observation data.
+            by_last_observation (bool, optional, default=False):
+                Sort by last observation date.
         """
         if by_last_observation:
             by_first_observation = False
         if by_first_observation:
-            fun = lambda i: getattr(self, i).time.min()
-            self.instruments = sorted(self.instruments, key=fun)
+            self.instruments = sorted(self.instruments, key=lambda i: getattr(self, i).time.min())
             self._build_arrays()
         if by_last_observation:
-            fun = lambda i: getattr(self, i).time.max()
-            self.instruments = sorted(self.instruments, key=fun)
+            self.instruments = sorted(self.instruments, key=lambda i: getattr(self, i).time.max())
             self._build_arrays()
 
 
@@ -1841,7 +2044,7 @@ class RV:
                 Postfix to add to the filenames ([star]_[instrument]_[postfix].rdb).
             save_nans (bool, optional)
                 Whether to save NaN values in the indicators, if they exist. If
-                False, the full observation is not saved.
+                False, the full observation which contains NaN values is not saved.
         """
         star_name = self.star.replace(' ', '')
 
@@ -1864,7 +2067,7 @@ class RV:
 
             if full:
                 if save_masked:
-                    d = np.c_[
+                    arrays = [
                         _s.time, _s.vrad, _s.svrad,
                         _s.fwhm, _s.fwhm_err,
                         _s.bispan, _s.bispan_err,
@@ -1873,7 +2076,7 @@ class RV:
                         _s.berv,
                     ]
                 else:
-                    d = np.c_[
+                    arrays = [
                         _s.mtime, _s.mvrad, _s.msvrad,
                         _s.fwhm[_s.mask], _s.fwhm_err[_s.mask],
                         _s.bispan[_s.mask], _s.bispan_err[_s.mask],
@@ -1882,12 +2085,13 @@ class RV:
                         _s.berv[_s.mask],
                     ]
                 if not save_nans:
-                    if np.isnan(d).any():
-                        # remove observations where any of the indicators are # NaN
-                        nan_mask = np.isnan(d[:, 3:]).any(axis=1)
-                        d = d[~nan_mask]
-                        if self.verbose:
-                            logger.warning(f'masking {nan_mask.sum()} observations with NaN in indicators')
+                    raise NotImplementedError
+                    # if np.isnan(d).any():
+                    #     # remove observations where any of the indicators are # NaN
+                    #     nan_mask = np.isnan(d[:, 3:]).any(axis=1)
+                    #     d = d[~nan_mask]
+                    #     if self.verbose:
+                    #         logger.warning(f'masking {nan_mask.sum()} observations with NaN in indicators')
 
                 header = '\t'.join(['bjd', 'vrad', 'svrad', 
                                     'fwhm', 'sig_fwhm',
@@ -1901,9 +2105,11 @@ class RV:
 
             else:
                 if save_masked:
-                    d = np.c_[_s.time, _s.vrad, _s.svrad]
+                    arrays = [_s.time, _s.vrad, _s.svrad]
                 else:
-                    d = np.c_[_s.mtime, _s.mvrad, _s.msvrad]
+                    arrays = [_s.mtime, _s.mvrad, _s.msvrad]
+
+                # d = np.stack(arrays, axis=1)
                 header = 'bjd\tvrad\tsvrad\n---\t----\t-----'
 
             file = f'{star_name}_{inst}.rdb'
@@ -1913,7 +2119,17 @@ class RV:
             files.append(file)
             file = os.path.join(directory, file)
 
-            np.savetxt(file, d, fmt='%9.5f', header=header, delimiter='\t', comments='')
+            N = len(arrays[0])
+            with open(file, 'w') as f:
+                f.write(header + '\n')
+                for i in range(N):
+                    for j, a in enumerate(arrays):
+                        f.write(str(a[i]))
+                        if j < len(arrays) - 1:
+                            f.write('\t')
+                    f.write('\n')
+
+            # np.savetxt(file, d, header=header, delimiter='\t', comments='', fmt='%f')
 
             if self.verbose:
                 logger.info(f'saving to {file}')

{arvi-0.1.25.dist-info → arvi-0.1.27.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: arvi
-Version: 0.1.25
+Version: 0.1.27
 Summary: The Automated RV Inspector
 Author-email: João Faria <joao.faria@unige.ch>
 License: MIT

{arvi-0.1.25.dist-info → arvi-0.1.27.dist-info}/RECORD

@@ -4,23 +4,23 @@ arvi/ariadne_wrapper.py,sha256=YvilopJa9T4NwPcj3Nah_U8smSeSAU5-HYZMb_GJ-BQ,2232
 arvi/berv.py,sha256=eKnpuPC1w45UrUEyFRbs9F9j3bXz3kxYzNXbnRgvFQM,17596
 arvi/binning.py,sha256=jbemJ-bM3aqoOsqMo_OhWt_co-JAQ0nhdG_GpTsrRsw,15403
 arvi/config.py,sha256=W-v8NNhRd_PROu0wCMilXmOhYcju4xbUalugd5u7SRU,1881
-arvi/dace_wrapper.py,sha256=cH7pQgKZDdK1Buahyl_D__H9WqVzBNMJuV6Ebw48amo,21270
-arvi/extra_data.py,sha256=WEEaYeLh52Zdv0uyHO72Ys5MWS3naTAP4wJV2BJ1mbk,2551
-arvi/gaia_wrapper.py,sha256=icm3LJjG9pjP47_bM30NFyocUQO3X3SHS5yQ-Dwcr5w,4653
+arvi/dace_wrapper.py,sha256=dwGj_XuN8J5An9I8ioeK7saj2TNLwwcobOu6oRo_HmM,22228
+arvi/extra_data.py,sha256=cpJGMle0ZqY_dtrmbbMQcyU48PkNjfzUgQ-qY-2XTj8,3249
+arvi/gaia_wrapper.py,sha256=2q_7bm6MGvTLlegfNUCY_EhnMKYv1CZmcbanOm_ot-k,4197
 arvi/headers.py,sha256=uvdJebw1M5YkGjE3vJJwYBOnLikib75uuZE9FXB5JJM,1673
 arvi/instrument_specific.py,sha256=-pbm2Vk3iK_1K7nDa1avlJOKHBcXllwILI4lQn-Ze-A,7761
 arvi/kima_wrapper.py,sha256=BvNTVqzM4lMNhLCyBFVh3T84hHfGKAFpgiYiOi4lh0g,2731
 arvi/lbl_wrapper.py,sha256=_ViGVkpakvuBR_xhu9XJRV5EKHpj5Go6jBZGJZMIS2Y,11850
 arvi/nasaexo_wrapper.py,sha256=mWt7eHgSZe4MBKCmUvMPTyUPGuiwGTqKugNBvmjOg9s,7306
-arvi/plots.py,sha256=WUm-sqN0aZTNXvE1kYpvmHTW9QPWqSCpKhNjwaqxjEk,29628
+arvi/plots.py,sha256=ys3M_zU701ubz-hEcE8Jpp4fG9D4yoZE7o7q1qW_-nA,29758
 arvi/programs.py,sha256=BW7xBNKLei7NVLLW3_lsVskwzkaIoNRiHK2jn9Tn2ZM,8879
 arvi/reports.py,sha256=ayPdZ4HZO9iCDdnADQ18gQPJh79o-1UYG7TYkvm9Lrc,4051
 arvi/setup_logger.py,sha256=pBzaRTn0hntozjbaRVx0JIbWGuENkvYUApa6uB-FsRo,279
-arvi/simbad_wrapper.py,sha256=iAAwEMcr1Hgu6lnDctmaCC1TLPCB8yAfHG0wxh9K9C8,5791
+arvi/simbad_wrapper.py,sha256=hyMnTeZ4DpnTzyEopkdUfNtJ_roSgdvYPXwYcmXVX2U,8238
 arvi/spectra.py,sha256=ebF1ocodTastLx0CyqLSpE8EZNDXBF8riyfxMr3L6H0,7491
 arvi/stats.py,sha256=ilzzGL9ew-SyVa9eEdrYCpD3DliOAwhoNUg9LIlHjzU,2583
 arvi/stellar.py,sha256=veuL_y9kJvvApU_jqYQqP3EkcRnQffTc8Us6iT5UrFI,3790
-arvi/timeseries.py,sha256=NdmSSYeDdS-cYBXPt8NCeKS1jLdv8LP6Zh561KRGfZc,77328
+arvi/timeseries.py,sha256=s_1bKO9sl09mGFXCp3iyUezFzCdiEwO7IU68mq8LH-Q,85746
 arvi/translations.py,sha256=PUSrn4zvYO2MqGzUxlFGwev_tBkgJaJrIYs6NKHzbWo,951
 arvi/utils.py,sha256=LImV8iPjG8ZKjPCT9lp25_pDb-51ZZk42Hc8bzZt7M0,6568
 arvi/data/info.svg,sha256=0IMI6W-eFoTD8acnury79WJJakpBwLa4qKS4JWpsXiI,489
@@ -29,8 +29,8 @@ arvi/data/obs_affected_blue_cryostat_issues.dat,sha256=z4AK17xfz8tGTDv1FjRvQFnio
 arvi/data/extra/HD86226_PFS1.rdb,sha256=vfAozbrKHM_j8dYkCBJsuHyD01KEM1asghe2KInwVao,3475
 arvi/data/extra/HD86226_PFS2.rdb,sha256=F2P7dB6gVyzCglUjNheB0hIHVClC5RmARrGwbrY1cfo,4114
 arvi/data/extra/metadata.json,sha256=C69hIw6CohyES6BI9vDWjxwSz7N4VOYX0PCgjXtYFmU,178
-arvi-0.1.25.dist-info/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
-arvi-0.1.25.dist-info/METADATA,sha256=kB1PpEDCZNesQG7KRzONb36uILEryuieL3QK8DbJAkU,1852
-arvi-0.1.25.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-arvi-0.1.25.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
-arvi-0.1.25.dist-info/RECORD,,
+arvi-0.1.27.dist-info/LICENSE,sha256=6JfQgl7SpM55t0EHMFNMnNh-AdkpGW25MwMiTnhdWQg,1068
+arvi-0.1.27.dist-info/METADATA,sha256=-x1faGqEzZcmUovGR1PApN_7fDp9PqmcWinEZYNV-KE,1852
+arvi-0.1.27.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+arvi-0.1.27.dist-info/top_level.txt,sha256=4EeiKDVLD45ztuflTGfQ3TU8GVjJg5Y95xS5XjI-utU,5
+arvi-0.1.27.dist-info/RECORD,,

{arvi-0.1.25.dist-info → arvi-0.1.27.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any